aboutsummaryrefslogtreecommitdiffstats
path: root/cryptography
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2013-10-22 14:28:24 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2013-10-22 14:28:24 -0500
commit0b2042b6269bae9869a6ecbde586cec8158f4553 (patch)
tree5c0a8acf4cb118332fe3a9f231bdcdae263e08ed /cryptography
parent9949702886c815277bb7483b1a0d429a2a7ffd7c (diff)
downloadcryptography-0b2042b6269bae9869a6ecbde586cec8158f4553.tar.gz
cryptography-0b2042b6269bae9869a6ecbde586cec8158f4553.tar.bz2
cryptography-0b2042b6269bae9869a6ecbde586cec8158f4553.zip
fixes #148 + test case
Diffstat (limited to 'cryptography')
-rw-r--r--cryptography/primitives/hashes.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cryptography/primitives/hashes.py b/cryptography/primitives/hashes.py
index c4bd8ad0..7133a916 100644
--- a/cryptography/primitives/hashes.py
+++ b/cryptography/primitives/hashes.py
@@ -44,7 +44,7 @@ class BaseHash(six.with_metaclass(abc.ABCMeta)):
self.digest_size)
def hexdigest(self):
- return binascii.hexlify(self.digest()).decode("ascii")
+ return str(binascii.hexlify(self.digest()).decode("ascii"))
def _copy_ctx(self):
return self._api.copy_hash_context(self._ctx)