summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-05-21 20:28:13 (GMT)
committerGeorg Brandl <georg@python.org>2010-05-21 20:28:13 (GMT)
commitfd0eb3fdf7afc4a8ea025ca6418b1b40affd56aa (patch)
treeba1562920790b1f9d7310e8913bedcc6ec770654 /Doc
parentb369358ee4a2ac39b9e276d765ee63f07049ecfc (diff)
downloadcpython-fd0eb3fdf7afc4a8ea025ca6418b1b40affd56aa.zip
cpython-fd0eb3fdf7afc4a8ea025ca6418b1b40affd56aa.tar.gz
cpython-fd0eb3fdf7afc4a8ea025ca6418b1b40affd56aa.tar.bz2
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. ........
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/hashlib.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst
index 3c98af7..a38f2f5 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.