diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-05-26 15:42:44 -0700 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-05-26 15:42:44 -0700 |
| commit | 0024fbb5ce336db4603fe56ab819538180192b05 (patch) | |
| tree | 8b92ef2099662840d169b7afd2b73f469d50c82c | |
| parent | c12318a7fd49b2a6f2f8f42b631550bc022da32c (diff) | |
| parent | 0d81d80f6e4c61f008e5e379da0fbcbd41b3a3c5 (diff) | |
| download | cpython-git-0024fbb5ce336db4603fe56ab819538180192b05.tar.gz | |
merge 3.4
| -rw-r--r-- | Doc/library/hashlib.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst index d27902e3c2..cc982f6318 100644 --- a/Doc/library/hashlib.rst +++ b/Doc/library/hashlib.rst @@ -180,9 +180,9 @@ Key Derivation Function ----------------------- Key derivation and key stretching algorithms are designed for secure password -hashing. Naive algorithms such as ``sha1(password)`` are not resistant -against brute-force attacks. A good password hashing function must be tunable, -slow and include a salt. +hashing. Naive algorithms such as ``sha1(password)`` are not resistant against +brute-force attacks. A good password hashing function must be tunable, slow, and +include a `salt <https://en.wikipedia.org/wiki/Salt_%28cryptography%29>`_. .. function:: pbkdf2_hmac(name, password, salt, rounds, dklen=None) |