diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2015-10-02 15:23:19 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2015-10-02 15:23:19 -0700 |
| commit | df426d05bb2b8404c8a4c4df6091ba117bf3cfcc (patch) | |
| tree | a411685503c21874b6ad2ee4ddf5a4d5ac1a66f2 | |
| parent | dfaa11af5cc4c1da42f0b61ba5e3c45e6e2e3854 (diff) | |
| parent | a8ac9e6441030f2cc49de579c3d598e5f05ca331 (diff) | |
Merge branch '1.15'
| -rw-r--r-- | paramiko/ecdsakey.py | 8 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/paramiko/ecdsakey.py b/paramiko/ecdsakey.py index 6b047959..8827a1db 100644 --- a/paramiko/ecdsakey.py +++ b/paramiko/ecdsakey.py @@ -129,13 +129,11 @@ class ECDSAKey (PKey): @staticmethod def generate(curve=curves.NIST256p, progress_func=None): """ - Generate a new private RSA key. This factory function can be used to + Generate a new private ECDSA key. This factory function can be used to generate a new host key or authentication key. - :param function progress_func: - an optional function to call at key points in key generation (used - by ``pyCrypto.PublicKey``). - :returns: A new private key (`.RSAKey`) object + :param function progress_func: Not used for this type of key. + :returns: A new private key (`.ECDSAKey`) object """ signing_key = SigningKey.generate(curve) key = ECDSAKey(vals=(signing_key, signing_key.get_verifying_key())) diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index d47f051a..573084d1 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,8 @@ Changelog ========= +* :support:`554 backported` Fix inaccuracies in the docstring for the ECDSA key + class. Thanks to Jared Hance for the patch. * :support:`516 backported` Document `~paramiko.agent.AgentRequestHandler`. Thanks to ``@toejough`` for report & suggestions. * :bug:`496` Fix a handful of small but critical bugs in Paramiko's GSSAPI |