summaryrefslogtreecommitdiff
path: root/src/leap/soledad/crypto.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-05-17 13:57:39 -0300
committerTomás Touceda <chiiph@leap.se>2013-05-17 13:57:39 -0300
commit8db98c3871fb7632cb0c29b219d7a1abed32f280 (patch)
treedc2a37a49d9c5a8a121228978f68a3f594b6df51 /src/leap/soledad/crypto.py
parenta55bcd926f94cd52d5a41cdd528672cdb8696f4b (diff)
parent1a2a3c6d72e173425885caa2342138c4615a69a3 (diff)
Merge remote-tracking branch 'drebs/feature/2529-use-pycrypto-for-symmetric-encryption' into develop
Diffstat (limited to 'src/leap/soledad/crypto.py')
-rw-r--r--src/leap/soledad/crypto.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/soledad/crypto.py b/src/leap/soledad/crypto.py
index 6140ef31..d0e2c720 100644
--- a/src/leap/soledad/crypto.py
+++ b/src/leap/soledad/crypto.py
@@ -123,7 +123,7 @@ class SoledadCrypto(object):
return hmac.new(
self.secret[self.MAC_KEY_LENGTH:],
doc_id,
- hashlib.sha256).hexdigest()
+ hashlib.sha256).digest()
def doc_mac_key(self, doc_id):
"""
@@ -147,7 +147,7 @@ class SoledadCrypto(object):
return hmac.new(
self.secret[:self.MAC_KEY_LENGTH],
doc_id,
- hashlib.sha256).hexdigest()
+ hashlib.sha256).digest()
#
# secret setters/getters