diff options
| author | Jeremy T. Bouse <Jeremy.Bouse@UnderGrid.net> | 2015-10-25 22:29:44 -0400 |
|---|---|---|
| committer | Jeremy T. Bouse <Jeremy.Bouse@UnderGrid.net> | 2015-10-25 22:29:44 -0400 |
| commit | ad30777fe9b9b34797ba7487056966d27d890974 (patch) | |
| tree | fd14ac1ad24a701986483860e1218e7cdc09c732 /paramiko/ecdsakey.py | |
| parent | 767153f789ed210fe00509f591b013320fc0f3fa (diff) | |
| parent | bf855e6da326dba0c46f005eedc9f390c6c3b206 (diff) | |
| download | python-paramiko-ad30777fe9b9b34797ba7487056966d27d890974.tar python-paramiko-ad30777fe9b9b34797ba7487056966d27d890974.tar.gz | |
Merge tag 'upstream/1.15.3'
Upstream version 1.15.3
Diffstat (limited to 'paramiko/ecdsakey.py')
| -rw-r--r-- | paramiko/ecdsakey.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/paramiko/ecdsakey.py b/paramiko/ecdsakey.py index 6b04795..8827a1d 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())) |