Commit d0127125 authored by Benjamin Peterson's avatar Benjamin Peterson

merge 3.4

parents f7c44442 b3e04cf9
...@@ -227,7 +227,7 @@ include a `salt <https://en.wikipedia.org/wiki/Salt_%28cryptography%29>`_. ...@@ -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.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment