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

Remove hashing from PlaintextKey.

Browse source 
Not needed since silent disk corruption will be detected
by the repository segment checksum.
This commit is contained in:
Jonas Borgström 2013-07-08 14:00:22 +02:00
parent a887fa2065
commit e578d28184
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
darc/key.py
View file

@ -73,19 +73,12 @@ def id_hash(self, data):
return sha256(data).digest() return sha256(data).digest()
def encrypt(self, data): def encrypt(self, data):
cdata = zlib.compress(data) return b''.join([self.TYPE_STR, zlib.compress(data)])
hash = sha256(cdata).digest()
return b''.join([self.TYPE_STR, hash, cdata])
def decrypt(self, id, data): def decrypt(self, id, data):
if data[0] != self.TYPE: if data[0] != self.TYPE:
raise IntegrityError('Invalid encryption envelope') raise IntegrityError('Invalid encryption envelope')
# This is just a hash and not a hmac but it will at least data = zlib.decompress(memoryview(data)[1:])
# stop unintentionally corrupted data from hitting zlib.decompress()
hash = memoryview(data)[1:33]
if memoryview(sha256(memoryview(data)[33:]).digest()) != hash:
raise IntegrityError('Payload checksum mismatch')
data = zlib.decompress(memoryview(data)[33:])
if id and sha256(data).digest() != id: if id and sha256(data).digest() != id:
raise IntegrityError('Chunk id verification failed') raise IntegrityError('Chunk id verification failed')
return data return data