upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-06-11 09:59:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

move IV type check to set_iv method

Browse source
This commit is contained in:
Thomas Waldmann 2016-08-29 18:11:12 +02:00
parent 71b8d7fc18
commit 11349d1699
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/borg/crypto/low_level.pyx
View file

@ -209,7 +209,6 @@ cdef class AES256_CTR_HMAC_SHA256:
self.iv_len = 16
self.iv_len_short = 8
self.mac_len = 32
assert iv is None or isinstance(iv, bytes) and len(iv) == self.iv_len
self.mac_key = mac_key
self.enc_key = enc_key
if iv is not None:
@ -326,6 +325,7 @@ cdef class AES256_CTR_HMAC_SHA256:
return (length + self.cipher_blk_len - 1) // self.cipher_blk_len
def set_iv(self, iv):
assert isinstance(iv, bytes) and len(iv) == self.iv_len
self.blocks = 0 # how many AES blocks got encrypted with this IV?
for i in range(self.iv_len):
self.iv[i] = iv[i]
@ -364,7 +364,6 @@ cdef class _AEAD_BASE:
assert isinstance(enc_key, bytes) and len(enc_key) == 32
self.iv_len = 12
self.mac_len = 16
assert iv is None or isinstance(iv, bytes) and len(iv) == self.iv_len
self.enc_key = enc_key
if iv is not None:
self.set_iv(iv)
@ -484,6 +483,7 @@ cdef class _AEAD_BASE:
return (length + self.cipher_blk_len - 1) // self.cipher_blk_len
def set_iv(self, iv):
assert isinstance(iv, bytes) and len(iv) == self.iv_len
self.blocks = 0 # number of cipher blocks encrypted with this IV
for i in range(self.iv_len):
self.iv[i] = iv[i]