mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #6340 from ThomasWaldmann/remove-deprecated-hmac 

remove deprecated HMAC_*
This commit is contained in:
TW 2022-02-26 20:41:28 +01:00 committed by GitHub
parent 8f945ea252 0f2a45b474
commit eec359cf22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/borg/crypto/low_level.pyx
View File

@ -87,19 +87,6 @@ cdef extern from "openssl/evp.h":
void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a) void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
cdef extern from "openssl/hmac.h": cdef extern from "openssl/hmac.h":
ctypedef struct HMAC_CTX:
pass
void HMAC_CTX_init(HMAC_CTX *ctx)
void HMAC_CTX_cleanup(HMAC_CTX *ctx)
HMAC_CTX *HMAC_CTX_new()
void HMAC_CTX_free(HMAC_CTX *a)
int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int key_len, const EVP_MD *md, ENGINE *impl)
int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, int len)
int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len)
unsigned char *HMAC(const EVP_MD *evp_md, unsigned char *HMAC(const EVP_MD *evp_md,
const void *key, int key_len, const void *key, int key_len,
const unsigned char *data, int data_len, const unsigned char *data, int data_len,
@ -372,7 +359,6 @@ cdef class AES256_CTR_BASE:
cdef class AES256_CTR_HMAC_SHA256(AES256_CTR_BASE): cdef class AES256_CTR_HMAC_SHA256(AES256_CTR_BASE):
cdef HMAC_CTX *hmac_ctx
cdef unsigned char *mac_key cdef unsigned char *mac_key
def __init__(self, mac_key, enc_key, iv=None, header_len=1, aad_offset=1): def __init__(self, mac_key, enc_key, iv=None, header_len=1, aad_offset=1):
@ -381,22 +367,18 @@ cdef class AES256_CTR_HMAC_SHA256(AES256_CTR_BASE):
super().__init__(mac_key, enc_key, iv=iv, header_len=header_len, aad_offset=aad_offset) super().__init__(mac_key, enc_key, iv=iv, header_len=header_len, aad_offset=aad_offset)
def __cinit__(self, mac_key, enc_key, iv=None, header_len=1, aad_offset=1): def __cinit__(self, mac_key, enc_key, iv=None, header_len=1, aad_offset=1):
self.hmac_ctx = HMAC_CTX_new() pass
def __dealloc__(self): def __dealloc__(self):
HMAC_CTX_free(self.hmac_ctx) pass
cdef mac_compute(self, const unsigned char *data1, int data1_len, cdef mac_compute(self, const unsigned char *data1, int data1_len,
const unsigned char *data2, int data2_len, const unsigned char *data2, int data2_len,
unsigned char *mac_buf): unsigned char *mac_buf):
if not HMAC_Init_ex(self.hmac_ctx, self.mac_key, self.mac_len, EVP_sha256(), NULL): data = data1[:data1_len] + data2[:data2_len]
raise CryptoError('HMAC_Init_ex failed') mac = hmac.HMAC(self.mac_key, data, hashlib.sha256).digest()
if not HMAC_Update(self.hmac_ctx, data1, data1_len): for i in range(self.mac_len):
raise CryptoError('HMAC_Update failed') mac_buf[i] = mac[i]
if not HMAC_Update(self.hmac_ctx, data2, data2_len):
raise CryptoError('HMAC_Update failed')
if not HMAC_Final(self.hmac_ctx, mac_buf, NULL):
raise CryptoError('HMAC_Final failed')
cdef mac_verify(self, const unsigned char *data1, int data1_len, cdef mac_verify(self, const unsigned char *data1, int data1_len,
const unsigned char *data2, int data2_len, const unsigned char *data2, int data2_len,