upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-06-11 01:41:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

crypto: get rid of deprecated HMAC_* functions

Browse source 
These were deprecated in OpenSSL 3.0.
Instead, use hmac.digest from Python stdlib.
This commit is contained in:
Thomas Waldmann 2022-02-23 03:04:33 +01:00
parent ae6be14822
commit c813f9ba59
No known key found for this signature in database
GPG key ID: 243ACFA951F78E01
1 changed files with 8 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,6 +60,8 @@ cdef extern from "openssl/evp.h":
const EVP_CIPHER *EVP_aes_256_ctr()
EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
@ -78,34 +80,10 @@ cdef extern from "openssl/evp.h":
const EVP_MD *EVP_sha256() nogil
EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
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,
const void *key, int key_len,
const unsigned char *data, int data_len,
unsigned char *md, unsigned int *md_len) nogil
cdef extern from "_crypto_helpers.h":
long OPENSSL_VERSION_NUMBER
HMAC_CTX *HMAC_CTX_new()
void HMAC_CTX_free(HMAC_CTX *a)
import struct
@ -364,7 +342,6 @@ cdef class AES256_CTR_BASE:
cdef class AES256_CTR_HMAC_SHA256(AES256_CTR_BASE):
cdef HMAC_CTX *hmac_ctx
cdef unsigned char mac_key[32]
def __init__(self, mac_key, enc_key, iv=None, header_len=1, aad_offset=1):
@ -373,22 +350,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)
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):
HMAC_CTX_free(self.hmac_ctx)
pass
cdef mac_compute(self, const unsigned char *data1, int data1_len,
const unsigned char *data2, int data2_len,
unsigned char *mac_buf):
if not HMAC_Init_ex(self.hmac_ctx, self.mac_key, self.mac_len, EVP_sha256(), NULL):
raise CryptoError('HMAC_Init_ex failed')
if not HMAC_Update(self.hmac_ctx, data1, data1_len):
raise CryptoError('HMAC_Update failed')
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')
data = data1[:data1_len] + data2[:data2_len]
mac = hmac.digest(self.mac_key[:self.mac_len], data, 'sha256')
for i in range(self.mac_len):
mac_buf[i] = mac[i]
cdef mac_verify(self, const unsigned char *data1, int data1_len,
const unsigned char *data2, int data2_len,