[Rest of patch #1182394] Add ._current() method so that we can use the written-in-C .hexdigest() method

This commit is contained in:
Andrew M. Kuchling 2006-12-27 03:31:24 +00:00
parent a7ebb33975
commit 7166232399
3 changed files with 15 additions and 4 deletions

View File

@ -78,6 +78,15 @@ class HMAC:
other.outer = self.outer.copy()
return other
def _current(self):
"""Return a hash object for the current state.
To be used only internally with digest() and hexdigest().
"""
h = self.outer.copy()
h.update(self.inner.digest())
return h
def digest(self):
"""Return the hash value of this hashing object.
@ -85,15 +94,14 @@ class HMAC:
not altered in any way by this function; you can continue
updating the object after calling this function.
"""
h = self.outer.copy()
h.update(self.inner.digest())
h = self._current()
return h.digest()
def hexdigest(self):
"""Like digest(), but returns a string of hexadecimal digits instead.
"""
return "".join([hex(ord(x))[2:].zfill(2)
for x in tuple(self.digest())])
h = self._current()
return h.hexdigest()
def new(key, msg = None, digestmod = None):
"""Create a new hashing object and return it.

View File

@ -285,6 +285,7 @@ Chris Hoffman
Albert Hofkamp
Jonathan Hogg
Gerrit Holl
Shane Holloway
Rune Holm
Philip Homburg
Naofumi Honda

View File

@ -103,6 +103,8 @@ Core and builtins
Library
-------
- Patch #1182394 from Shane Holloway: speed up HMAC.hexdigest.
- Patch #1262036: Prevent TarFiles from being added to themselves under
certain conditions.