mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-23 14:41:43 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4407 from bket/libressl

Browse source 
1.2.0a: fix LibreSSL support, see #4403
This commit is contained in:
TW 2019-02-26 22:31:49 +01:00 committed by GitHub
commit de151cd338
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/borg/crypto/_crypto_helpers.h
View file

@ -13,3 +13,8 @@ const EVP_CIPHER *EVP_aes_256_ocb(void); /* dummy, so that code compiles */
const EVP_CIPHER *EVP_chacha20_poly1305(void); /* dummy, so that code compiles */ const EVP_CIPHER *EVP_chacha20_poly1305(void); /* dummy, so that code compiles */
#endif #endif
#if !defined(LIBRESSL_VERSION_NUMBER)
#define LIBRESSL_VERSION_NUMBER 0
#endif

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

@ -115,6 +115,7 @@ cdef extern from "openssl/hmac.h":
cdef extern from "_crypto_helpers.h": cdef extern from "_crypto_helpers.h":
long OPENSSL_VERSION_NUMBER long OPENSSL_VERSION_NUMBER
long LIBRESSL_VERSION_NUMBER
ctypedef struct HMAC_CTX: ctypedef struct HMAC_CTX:
pass pass
@ -126,7 +127,7 @@ cdef extern from "_crypto_helpers.h":
const EVP_CIPHER *EVP_chacha20_poly1305() # dummy const EVP_CIPHER *EVP_chacha20_poly1305() # dummy
openssl10 = OPENSSL_VERSION_NUMBER < 0x10100000 openssl10 = OPENSSL_VERSION_NUMBER < 0x10100000 or LIBRESSL_VERSION_NUMBER
import struct import struct
@ -673,7 +674,7 @@ cdef class _CHACHA_BASE(_AEAD_BASE):
cdef class AES256_OCB(_AES_BASE): cdef class AES256_OCB(_AES_BASE):
@classmethod @classmethod
def requirements_check(cls): def requirements_check(cls):
if OPENSSL_VERSION_NUMBER < 0x10100000: if openssl10:
raise ValueError('AES OCB requires OpenSSL >= 1.1.0. Detected: OpenSSL %08x' % OPENSSL_VERSION_NUMBER) raise ValueError('AES OCB requires OpenSSL >= 1.1.0. Detected: OpenSSL %08x' % OPENSSL_VERSION_NUMBER)
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):
@ -685,7 +686,7 @@ cdef class AES256_OCB(_AES_BASE):
cdef class CHACHA20_POLY1305(_CHACHA_BASE): cdef class CHACHA20_POLY1305(_CHACHA_BASE):
@classmethod @classmethod
def requirements_check(cls): def requirements_check(cls):
if OPENSSL_VERSION_NUMBER < 0x10100000: if openssl10:
raise ValueError('CHACHA20-POLY1305 requires OpenSSL >= 1.1.0. Detected: OpenSSL %08x' % OPENSSL_VERSION_NUMBER) raise ValueError('CHACHA20-POLY1305 requires OpenSSL >= 1.1.0. Detected: OpenSSL %08x' % OPENSSL_VERSION_NUMBER)
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):