mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

merge 3.4

Browse source
This commit is contained in:
Benjamin Peterson 2014-05-26 15:48:19 -07:00
commit e44b947a9d
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Doc/library/hashlib.rst
View file

@ -197,8 +197,7 @@ include a `salt <https://en.wikipedia.org/wiki/Salt_%28cryptography%29>`_.
a proper source, e.g. :func:`os.urandom`.
The number of *rounds* should be chosen based on the hash algorithm and
computing power. As of 2013 a value of at least 100,000 rounds of SHA-256
have been suggested.
computing power. As of 2013, at least 100,000 rounds of SHA-256 is suggested.
*dklen* is the length of the derived key. If *dklen* is ``None`` then the
digest size of the hash algorithm *name* is used, e.g. 64 for SHA-512.