diff -r bbfbde6ee9d0 Doc/library/hashlib.rst --- a/Doc/library/hashlib.rst Thu Feb 18 17:34:32 2016 +0200 +++ b/Doc/library/hashlib.rst Fri Feb 19 11:30:26 2016 +0100 @@ -185,7 +185,7 @@ include a `salt `_. -.. function:: pbkdf2_hmac(name, password, salt, rounds, dklen=None) +.. function:: pbkdf2_hmac(name, password, salt, iterations, dklen=None) The function provides PKCS#5 password-based key derivation function 2. It uses HMAC as pseudorandom function. @@ -196,8 +196,9 @@ a sensible value (e.g. 1024). *salt* should be about 16 or more bytes from 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, at least 100,000 rounds of SHA-256 is suggested. + The number of *iterations* should be chosen based on the hash algorithm and + computing power. As of 2013, at least 100,000 iterations 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.