From: Georg Brandl Date: Fri, 21 May 2010 20:28:13 +0000 (+0000) Subject: Merged revisions 81404 via svnmerge from X-Git-Tag: v3.2a1~728 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd0eb3fdf7afc4a8ea025ca6418b1b40affd56aa;p=python 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. ........ --- diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst index 3c98af7627..a38f2f550d 100644 --- a/Doc/library/hashlib.rst +++ b/Doc/library/hashlib.rst @@ -151,7 +151,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.