mirror of https://github.com/borgbackup/borg.git
Merge pull request #1895 from ThomasWaldmann/fix-1894
fix traceback in Error handler if id is None, fixes #1894
This commit is contained in:
commit
b25de0ab38
|
@ -105,7 +105,8 @@ class PlaintextKey(KeyBase):
|
||||||
|
|
||||||
def decrypt(self, id, data):
|
def decrypt(self, id, data):
|
||||||
if data[0] != self.TYPE:
|
if data[0] != self.TYPE:
|
||||||
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)
|
||||||
data = self.compressor.decompress(memoryview(data)[1:])
|
data = self.compressor.decompress(memoryview(data)[1:])
|
||||||
if id and sha256(data).digest() != id:
|
if id and sha256(data).digest() != id:
|
||||||
raise IntegrityError('Chunk %s: id verification failed' % bin_to_hex(id))
|
raise IntegrityError('Chunk %s: id verification failed' % bin_to_hex(id))
|
||||||
|
|
Loading…
Reference in New Issue