mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-26 17:57:59 +00:00
Code Issues Releases Wiki Activity

crypto: low_level: reduce class inheritance depth

Browse source
This commit is contained in:
Thomas Waldmann 2022-03-22 02:57:28 +01:00
parent e4b65dea76
commit 3a0e1a1cc2
1 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -598,19 +598,7 @@ cdef class _AEAD_BASE:
return iv + 1 return iv + 1
cdef class _AES_BASE(_AEAD_BASE): cdef class AES256_OCB(_AEAD_BASE):
def __init__(self, *args, **kwargs):
self.cipher_blk_len = 16
super().__init__(*args, **kwargs)
cdef class _CHACHA_BASE(_AEAD_BASE):
def __init__(self, *args, **kwargs):
self.cipher_blk_len = 64
super().__init__(*args, **kwargs)
cdef class AES256_OCB(_AES_BASE):
@classmethod @classmethod
def requirements_check(cls): def requirements_check(cls):
if is_libressl: if is_libressl:
@ -619,10 +607,11 @@ cdef class AES256_OCB(_AES_BASE):
def __init__(self, key, iv=None, header_len=0, aad_offset=0): def __init__(self, key, iv=None, header_len=0, aad_offset=0):
self.requirements_check() self.requirements_check()
self.cipher = EVP_aes_256_ocb self.cipher = EVP_aes_256_ocb
self.cipher_blk_len = 16
super().__init__(key, iv=iv, header_len=header_len, aad_offset=aad_offset) super().__init__(key, iv=iv, header_len=header_len, aad_offset=aad_offset)
cdef class CHACHA20_POLY1305(_CHACHA_BASE): cdef class CHACHA20_POLY1305(_AEAD_BASE):
@classmethod @classmethod
def requirements_check(cls): def requirements_check(cls):
if is_libressl: if is_libressl:
@ -631,6 +620,7 @@ cdef class CHACHA20_POLY1305(_CHACHA_BASE):
def __init__(self, key, iv=None, header_len=0, aad_offset=0): def __init__(self, key, iv=None, header_len=0, aad_offset=0):
self.requirements_check() self.requirements_check()
self.cipher = EVP_chacha20_poly1305 self.cipher = EVP_chacha20_poly1305
self.cipher_blk_len = 64
super().__init__(key, iv=iv, header_len=header_len, aad_offset=aad_offset) super().__init__(key, iv=iv, header_len=header_len, aad_offset=aad_offset)
@ -735,7 +725,6 @@ cdef class AES:
return iv + self.blocks return iv + self.blocks
def hmac_sha256(key, data): def hmac_sha256(key, data):
return hmac.digest(key, data, 'sha256') return hmac.digest(key, data, 'sha256')