From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Wed, 22 May 2024 08:58:03 +0000 (+0200) Subject: [3.12] Clarify that dklen is expected in bytes for the hashlib functions (GH-106624... X-Git-Tag: v3.12.4~74 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9bd9879ca7d9af7d62c53f0a8ca5d2b1e900cc4b;p=thirdparty%2FPython%2Fcpython.git [3.12] Clarify that dklen is expected in bytes for the hashlib functions (GH-106624) (GH-119384) (cherry picked from commit 5adf78f546a5dc3f5b8eeaa209a2e8437ae96ac8) Co-authored-by: Mathijs Mortimer --- diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst index 4b4d8378d660..8f4c42d050b3 100644 --- a/Doc/library/hashlib.rst +++ b/Doc/library/hashlib.rst @@ -328,7 +328,7 @@ include a `salt `_. your application, read *Appendix A.2.2* of NIST-SP-800-132_. The answers on the `stackexchange pbkdf2 iterations question`_ explain in detail. - *dklen* is the length of the derived key. If *dklen* is ``None`` then the + *dklen* is the length of the derived key in bytes. If *dklen* is ``None`` then the digest size of the hash algorithm *hash_name* is used, e.g. 64 for SHA-512. >>> from hashlib import pbkdf2_hmac @@ -357,7 +357,7 @@ include a `salt `_. *n* is the CPU/Memory cost factor, *r* the block size, *p* parallelization factor and *maxmem* limits memory (OpenSSL 1.1.0 defaults to 32 MiB). - *dklen* is the length of the derived key. + *dklen* is the length of the derived key in bytes. .. versionadded:: 3.6