diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-09-18 18:00:59 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-09-18 18:00:59 -0700 |
| commit | 848a7209e29d580594d35f299b01db97714caf92 (patch) | |
| tree | 57425aa20493dccc62bc95e59268fde66eeb368f /sites | |
| parent | 6ee3f1a074d2b13cca2a5d267f16159f294b98c6 (diff) | |
| parent | 16a8df33eb4e9723fea244959db2b157be825781 (diff) | |
Merge branch 'master' into switch-to-cryptography
Conflicts:
paramiko/ecdsakey.py
tests/test_client.py
Diffstat (limited to 'sites')
| -rw-r--r-- | sites/docs/api/keys.rst | 17 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 1 |
2 files changed, 18 insertions, 0 deletions
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 diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 38a56101..d0bd481c 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,7 @@ Changelog ========= +* :release:`1.15.0 <2014-09-18>` * :support:`393` Replace internal use of PyCrypto's ``SHA.new`` with the stdlib's ``hashlib.sha1``. Thanks to Alex Gaynor. * :feature:`267` (also :issue:`250`, :issue:`241`, :issue:`228`) Add GSS-API / |