merge 3.5

This commit is contained in:
Benjamin Peterson 2015-09-27 02:05:18 -07:00
commit 81520b0bed
1 changed files with 1 additions and 1 deletions

View File

@ -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 http://csrc.nist.gov/publications/fips/fips180-2/fips180-2.pdf
The FIPS 180-2 publication on Secure Hash Algorithms. 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 Wikipedia article with information on which algorithms have known issues and
what that means regarding their use. what that means regarding their use.