summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-11-06 20:51:31 (GMT)
committerGuido van Rossum <guido@python.org>2007-11-06 20:51:31 (GMT)
commita19f80c6df2df5e8a5d0cff37131097835ef971e (patch)
tree21509dce5dd4cf63c75df00e83b411f43db479aa /Doc
parenta3538ebfe3120cf7478f91bd76674234b8cffda8 (diff)
downloadcpython-a19f80c6df2df5e8a5d0cff37131097835ef971e.zip
cpython-a19f80c6df2df5e8a5d0cff37131097835ef971e.tar.gz
cpython-a19f80c6df2df5e8a5d0cff37131097835ef971e.tar.bz2
Merged revisions 58862-58885 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r58868 | gregory.p.smith | 2007-11-05 16:19:03 -0800 (Mon, 05 Nov 2007) | 3 lines Fixes Issue 1385: The hmac module now computes the correct hmac when using hashes with a block size other than 64 bytes (such as sha384 and sha512). ........
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/hashlib.rst10
1 files changed, 9 insertions, 1 deletions
diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst
index 0f8a742..a725e07 100644
--- a/Doc/library/hashlib.rst
+++ b/Doc/library/hashlib.rst
@@ -52,6 +52,10 @@ spammish repetition'``::
>>> m.update(b" the spammish repetition")
>>> m.digest()
b'\xbbd\x9c\x83\xdd\x1e\xa5\xc9\xd9\xde\xc9\xa1\x8d\xf0\xff\xe9'
+ >>> m.digest_size
+ 16
+ >>> m.block_size
+ 64
More condensed::
@@ -76,7 +80,11 @@ returned by the constructors:
.. data:: digest_size
- The size of the resulting digest in bytes.
+ The size of the resulting hash in bytes.
+
+.. data:: block_size
+
+ The internal block size of the hash algorithm in bytes.
A hash object has the following methods: