mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix traceback in --cipher 1 mode (aes-ctr + hmac)

This commit is contained in:
Thomas Waldmann 2015-05-10 17:44:15 +02:00
parent b1bca71483
commit 1f64ce7709
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
attic/key.py
View File

@ -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)