Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge 3.4

This commit is contained in:
Benjamin Peterson 2014-05-26 15:45:22 -07:00
parent 0024fbb5ce f9ea5f39d8
commit 2059ded1af
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Doc/library/hashlib.rst
View File

@ -210,9 +210,11 @@ include a `salt <https://en.wikipedia.org/wiki/Salt_%28cryptography%29>`_.
.. versionadded:: 3.4
.. note:: A fast implementation of *pbkdf2_hmac* is available with OpenSSL.
The Python implementation uses an inline version of :mod:`hmac`. It is
about three times slower and doesn't release the GIL.
.. note::
A fast implementation of *pbkdf2_hmac* is available with OpenSSL. The
Python implementation uses an inline version of :mod:`hmac`. It is about
three times slower and doesn't release the GIL.
.. seealso::