diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-09-18 16:28:06 -0700 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-09-18 16:28:06 -0700 |
commit | 6ee3f1a074d2b13cca2a5d267f16159f294b98c6 (patch) | |
tree | 10cfb20e523ea9a337ccc61a3389b95572fe3bca /sites | |
parent | ca63b94a3a4461df5aabc38ec5ce35a43a48afac (diff) | |
parent | 381e86171e28ebfaa64c3dabe0e394448eb03aa3 (diff) |
Merge branch 'master' into switch-to-cryptography
Diffstat (limited to 'sites')
-rw-r--r-- | sites/www/changelog.rst | 8 | ||||
-rw-r--r-- | sites/www/installing.rst | 11 |
2 files changed, 16 insertions, 3 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 1dab5219..38a56101 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,10 +2,18 @@ Changelog ========= +* :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 764c0a13..507fe2fa 100644 --- a/sites/www/installing.rst +++ b/sites/www/installing.rst @@ -76,14 +76,19 @@ compiler. 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. |