Skip to content

[3.12] Clarify that dklen is expected in bytes for the hashlib functions (GH-106624) #119384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 1 commit into from
May 22, 2024
Merged

[3.12] Clarify that dklen is expected in bytes for the hashlib functions (GH-106624) #119384

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Clarify that dklen is expected in bytes for the hashlib functions (GH… 
…-106624)

(cherry picked from commit 5adf78f)

Co-authored-by: Mathijs Mortimer <thiezn@users.noreply.github.com>
  • Loading branch information
@thiezn @miss-islington
thiezn authored and miss-islington committed May 22, 2024
commit 0f49471911d542bd677a4cc33cab70e5ce846719
4 changes: 2 additions & 2 deletions Doc/library/hashlib.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ include a `salt <https://en.wikipedia.org/wiki/Salt_%28cryptography%29>`_.
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
Expand Down Expand Up @@ -357,7 +357,7 @@ include a `salt <https://en.wikipedia.org/wiki/Salt_%28cryptography%29>`_.

*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

Expand Down