summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
Diffstat (limited to 'sites')
-rw-r--r--sites/docs/api/keys.rst17
-rw-r--r--sites/www/changelog.rst9
-rw-r--r--sites/www/installing.rst11
3 files changed, 34 insertions, 3 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 1dab5219..d0bd481c 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,10 +2,19 @@
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 /
SSPI (e.g. Kerberos) key exchange and authentication support
(:ref:`installation docs here <gssapi>`). Mega thanks to Sebastian Deiß, with
assist by Torsten Landschoff.
+
+ .. note::
+ Unix users should be aware that the ``python-gssapi`` library (a
+ requirement for using this functionality) only appears to support
+ Python 2.7 and up at this time.
+
* :bug:`346 major` Fix an issue in private key files' encryption salts that
could cause tracebacks and file corruption if keys were re-encrypted. Credit
to Xavier Nunn.
diff --git a/sites/www/installing.rst b/sites/www/installing.rst
index 5528b28a..a657c3fc 100644
--- a/sites/www/installing.rst
+++ b/sites/www/installing.rst
@@ -109,14 +109,19 @@ installation of Paramiko via ``pypm``::
Optional dependencies for GSS-API / SSPI / Kerberos
===================================================
-In order to use Kerberos & related functionality, a couple of additional
-dependencies are required (these are not listed in our ``setup.py`` due to
-their infrequent utility & non-platform-agnostic requirements):
+In order to use GSS-API/Kerberos & related functionality, a couple of
+additional dependencies are required (these are not listed in our ``setup.py``
+due to their infrequent utility & non-platform-agnostic requirements):
+* It hopefully goes without saying but **all platforms** need **a working
+ installation of GSS-API itself**, e.g. Heimdal.
* **All platforms** need `pyasn1 <https://pypi.python.org/pypi/pyasn1>`_
``0.1.7`` or better.
* **Unix** needs `python-gssapi <https://pypi.python.org/pypi/python-gssapi/>`_
``0.6.1`` or better.
+
+ .. note:: This library appears to only function on Python 2.7 and up.
+
* **Windows** needs `pywin32 <https://pypi.python.org/pypi/pywin32>`_ ``2.1.8``
or better.