diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-09-27 08:23:35 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-09-27 08:23:35 (GMT) |
| commit | 16b570847130b150d116f303174309333a2cbdc7 (patch) | |
| tree | d27908ddca5cd45041122f2606255d55bb7718ff /Doc/library | |
| parent | bdb93c3e638a1b8191d68052b3cea2a0475bc530 (diff) | |
| parent | c402d8dceae14925bba22df773ed2224fa191665 (diff) | |
| download | cpython-16b570847130b150d116f303174309333a2cbdc7.zip cpython-16b570847130b150d116f303174309333a2cbdc7.tar.gz cpython-16b570847130b150d116f303174309333a2cbdc7.tar.bz2 | |
merge 3.4
Diffstat (limited to 'Doc/library')
| -rw-r--r-- | Doc/library/hashlib.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst index e0a877a..8492422 100644 --- a/Doc/library/hashlib.rst +++ b/Doc/library/hashlib.rst @@ -176,8 +176,8 @@ A hash object has the following methods: compute the digests of data sharing a common initial substring. -Key Derivation Function ------------------------ +Key derivation +-------------- Key derivation and key stretching algorithms are designed for secure password hashing. Naive algorithms such as ``sha1(password)`` are not resistant against |