diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-09-18 17:50:58 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-09-18 17:50:58 -0700 |
| commit | b3bae9ab64294cdf06c553d87dfdf294e90dc235 (patch) | |
| tree | e660b4d0c078c6858c33d57d353882d40fedbbdb | |
| parent | 009d6ba95808b15fae25a6730cd06d154580b800 (diff) | |
| parent | 17dbb6a48c0ccf645bc8a53d22ba502a71a99a26 (diff) | |
Merge branch '1.13' into 1.14
| -rw-r--r-- | paramiko/ecdsakey.py | 13 | ||||
| -rw-r--r-- | sites/docs/api/keys.rst | 17 |
2 files changed, 22 insertions, 8 deletions
diff --git a/paramiko/ecdsakey.py b/paramiko/ecdsakey.py index 6736315f..22d05717 100644 --- a/paramiko/ecdsakey.py +++ b/paramiko/ecdsakey.py @@ -17,7 +17,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. """ -L{ECDSAKey} +ECDSA keys """ import binascii @@ -130,13 +130,10 @@ class ECDSAKey (PKey): Generate a new private RSA key. This factory function can be used to generate a new host key or authentication key. - @param bits: number of bits the generated key should be. - @type bits: int - @param progress_func: an optional function to call at key points in - key generation (used by C{pyCrypto.PublicKey}). - @type progress_func: function - @return: new private key - @rtype: L{RSAKey} + :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 """ signing_key = ECDSA.generate() key = ECDSAKey(vals=(signing_key, signing_key.get_verifying_key())) diff --git a/sites/docs/api/keys.rst b/sites/docs/api/keys.rst index af7b58c4..c6412f77 100644 --- a/sites/docs/api/keys.rst +++ b/sites/docs/api/keys.rst @@ -1,6 +1,23 @@ +============ Key handling ============ +Parent key class +================ + .. automodule:: paramiko.pkey + +DSA (DSS) +========= + .. automodule:: paramiko.dsskey + +RSA +=== + .. automodule:: paramiko.rsakey + +ECDSA +===== + +.. automodule:: paramiko.ecdsakey |