mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-24 00:37:56 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1905 from ThomasWaldmann/fix-1903

Browse source 
fix TypeError in errorhandler, fixes #1903
This commit is contained in:
enkore 2016-11-30 01:03:17 +01:00 committed by GitHub
commit cdd9891444
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
borg/key.py
View file

@ -143,11 +143,13 @@ def encrypt(self, data):
def decrypt(self, id, data): def decrypt(self, id, data):
if not (data[0] == self.TYPE or if not (data[0] == self.TYPE or
data[0] == PassphraseKey.TYPE and isinstance(self, RepoKey)): data[0] == PassphraseKey.TYPE and isinstance(self, RepoKey)):
raise IntegrityError('Chunk %s: Invalid encryption envelope' % bin_to_hex(id)) id_str = bin_to_hex(id) if id is not None else '(unknown)'
raise IntegrityError('Chunk %s: Invalid encryption envelope' % id_str)
hmac_given = memoryview(data)[1:33] hmac_given = memoryview(data)[1:33]
hmac_computed = memoryview(HMAC(self.enc_hmac_key, memoryview(data)[33:], sha256).digest()) hmac_computed = memoryview(HMAC(self.enc_hmac_key, memoryview(data)[33:], sha256).digest())
if not compare_digest(hmac_computed, hmac_given): if not compare_digest(hmac_computed, hmac_given):
raise IntegrityError('Chunk %s: Encryption envelope checksum mismatch' % bin_to_hex(id)) id_str = bin_to_hex(id) if id is not None else '(unknown)'
raise IntegrityError('Chunk %s: Encryption envelope checksum mismatch' % id_str)
self.dec_cipher.reset(iv=PREFIX + data[33:41]) self.dec_cipher.reset(iv=PREFIX + data[33:41])
data = self.compressor.decompress(self.dec_cipher.decrypt(data[41:])) data = self.compressor.decompress(self.dec_cipher.decrypt(data[41:]))
if id: if id: