diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-09-27 09:05:12 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-09-27 09:05:12 (GMT) |
| commit | e0daa86ce9791de963781f91e92ceb9aeb671909 (patch) | |
| tree | 785366f70569c60bed690b95256f0bfc0d27529f /Doc/library | |
| parent | 16b570847130b150d116f303174309333a2cbdc7 (diff) | |
| parent | 1dd72e6bc51deebf70bee09d816297c56190e5ca (diff) | |
| download | cpython-e0daa86ce9791de963781f91e92ceb9aeb671909.zip cpython-e0daa86ce9791de963781f91e92ceb9aeb671909.tar.gz cpython-e0daa86ce9791de963781f91e92ceb9aeb671909.tar.bz2 | |
merge 3.4
Diffstat (limited to 'Doc/library')
| -rw-r--r-- | Doc/library/hashlib.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst index 8492422..769f96f 100644 --- a/Doc/library/hashlib.rst +++ b/Doc/library/hashlib.rst @@ -227,7 +227,7 @@ include a `salt <https://en.wikipedia.org/wiki/Salt_%28cryptography%29>`_. http://csrc.nist.gov/publications/fips/fips180-2/fips180-2.pdf The FIPS 180-2 publication on Secure Hash Algorithms. - http://en.wikipedia.org/wiki/Cryptographic_hash_function#Cryptographic_hash_algorithms + https://en.wikipedia.org/wiki/Cryptographic_hash_function#Cryptographic_hash_algorithms Wikipedia article with information on which algorithms have known issues and what that means regarding their use. |