From 1f64ce7709b028e86fc09b4a3b77ff86593bc76c Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 10 May 2015 17:44:15 +0200 Subject: [PATCH] fix traceback in --cipher 1 mode (aes-ctr + hmac) --- attic/key.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/attic/key.py b/attic/key.py index fd8698e70..b6597a48b 100644 --- a/attic/key.py +++ b/attic/key.py @@ -338,12 +338,12 @@ class AES_CTR_HMAC: _, data = self.enc_cipher.compute_mac_and_encrypt(data) self.enc_iv = increment_iv(meta.iv, len(data)) aad = get_aad(meta) - mac = HMAC(self.hmac_key, aad + data, sha256).digest() # XXX mac / hash flexibility + mac = HMAC_SHA256(self.hmac_key, aad + data).digest() # XXX mac / hash flexibility return mac, data def check_mac_and_decrypt(self, mac, meta, data): aad = get_aad(meta) - if HMAC(self.hmac_key, aad + data, sha256).digest() != mac: + if HMAC_SHA256(self.hmac_key, aad + data).digest() != mac: # XXX mac / hash flexibility raise IntegrityError('Encryption envelope checksum mismatch') self.dec_cipher.reset(iv=meta.iv) data = self.dec_cipher.check_mac_and_decrypt(None, data)