From bc9a99df86078138de5dc70c580299c06c31b97a Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Fri, 21 May 2010 20:28:10 +0000 Subject: [PATCH] Merged revisions 81404 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81404 | georg.brandl | 2010-05-21 22:24:45 +0200 (Fr, 21 Mai 2010) | 1 line #8783: replace link to now dead hash collision FAQ. ........ --- Doc/library/hashlib.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst index c9ef469c091..a889a2f901d 100644 --- a/Doc/library/hashlib.rst +++ b/Doc/library/hashlib.rst @@ -127,7 +127,7 @@ A hash object has the following methods: http://csrc.nist.gov/publications/fips/fips180-2/fips180-2.pdf The FIPS 180-2 publication on Secure Hash Algorithms. - http://www.cryptography.com/cnews/hash.html - Hash Collision FAQ with information on which algorithms have known issues and + http://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.