diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-05-26 22:41:26 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-05-26 22:41:26 (GMT) |
| commit | 0ccff4d3e10af0d1c7ddba8e1b60526578c6718a (patch) | |
| tree | be0a7bfdda5424279d5500c86b62c7cad158b0d7 /Doc/library | |
| parent | 1a2cf9aba786516a85bbb58285bfe245853b2a90 (diff) | |
| download | cpython-0ccff4d3e10af0d1c7ddba8e1b60526578c6718a.zip cpython-0ccff4d3e10af0d1c7ddba8e1b60526578c6718a.tar.gz cpython-0ccff4d3e10af0d1c7ddba8e1b60526578c6718a.tar.bz2 | |
oxford comma
Diffstat (limited to 'Doc/library')
| -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 d27902e..661338e 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. .. function:: pbkdf2_hmac(name, password, salt, rounds, dklen=None) |