summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory P. Smith <greg@mad-scientist.com>2008-03-19 01:38:35 (GMT)
committerGregory P. Smith <greg@mad-scientist.com>2008-03-19 01:38:35 (GMT)
commitbde40078b07cd26f850f2a04848e9e1d95442a1f (patch)
tree52f9ab4cef53da8cf0b73d5013bf022ba904dbc2
parent0279f4395057d4228c82c34b2c282d81aaabbde5 (diff)
downloadcpython-bde40078b07cd26f850f2a04848e9e1d95442a1f.zip
cpython-bde40078b07cd26f850f2a04848e9e1d95442a1f.tar.gz
cpython-bde40078b07cd26f850f2a04848e9e1d95442a1f.tar.bz2
Mention that crc32 and adler32 are available in a different module (zlib).
Some people look for them in hashlib.
-rw-r--r--Doc/library/hashlib.rst4
-rw-r--r--Lib/hashlib.py3
2 files changed, 7 insertions, 0 deletions
diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst
index 8bba718..bfb007f 100644
--- a/Doc/library/hashlib.rst
+++ b/Doc/library/hashlib.rst
@@ -21,6 +21,10 @@ algorithm (defined in Internet :rfc:`1321`). The terms secure hash and message
digest are interchangeable. Older algorithms were called message digests. The
modern term is secure hash.
+.. note::
+ If you want the adler32 or crc32 hash functions they are available in
+ the :mod:`zlib` module.
+
.. warning::
Some algorithms have known hash collision weaknesses, see the FAQ at the end.
diff --git a/Lib/hashlib.py b/Lib/hashlib.py
index f7c0211..13124e2 100644
--- a/Lib/hashlib.py
+++ b/Lib/hashlib.py
@@ -18,6 +18,9 @@ md5(), sha1(), sha224(), sha256(), sha384(), and sha512()
More algorithms may be available on your platform but the above are
guaranteed to exist.
+NOTE: If you want the adler32 or crc32 hash functions they are available in
+the zlib module.
+
Choose your hash function wisely. Some have known collision weaknesses.
sha384 and sha512 will be slow on 32 bit platforms.