diff options
| author | Georg Brandl <georg@python.org> | 2010-05-21 20:36:03 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-05-21 20:36:03 (GMT) |
| commit | 8c5a7bbf0e6c556df90442d776423e6e29cf0d70 (patch) | |
| tree | 84f589597f53ef7dd78f56221e392bdf87d79ced /Doc/library/hashlib.rst | |
| parent | 71d305c83d324ec46717924d119e27c03156b8fa (diff) | |
| download | cpython-8c5a7bbf0e6c556df90442d776423e6e29cf0d70.zip cpython-8c5a7bbf0e6c556df90442d776423e6e29cf0d70.tar.gz cpython-8c5a7bbf0e6c556df90442d776423e6e29cf0d70.tar.bz2 | |
Merged revisions 76888,76922,81406 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
................
r76888 | georg.brandl | 2009-12-19 18:51:41 +0100 (Sa, 19 Dez 2009) | 1 line
#7495: Review of Programming FAQ by Florent Xicluna.
................
r76922 | georg.brandl | 2009-12-20 15:21:27 +0100 (So, 20 Dez 2009) | 1 line
#7495: more review fixes.
................
r81406 | georg.brandl | 2010-05-21 22:28:13 +0200 (Fr, 21 Mai 2010) | 9 lines
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/library/hashlib.rst')
| -rw-r--r-- | Doc/library/hashlib.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst index a776df1..20d04ab 100644 --- a/Doc/library/hashlib.rst +++ b/Doc/library/hashlib.rst @@ -142,7 +142,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. |