diff --git a/src/borg/crypto/_crypto_helpers.c b/src/borg/crypto/_crypto_helpers.c index 18fbe5220..856736aba 100644 --- a/src/borg/crypto/_crypto_helpers.c +++ b/src/borg/crypto/_crypto_helpers.c @@ -1,6 +1,5 @@ /* some helpers, so our code also works with OpenSSL 1.0.x */ -#include #include #include diff --git a/src/borg/crypto/_crypto_helpers.h b/src/borg/crypto/_crypto_helpers.h index 0a3021af6..8d17d5388 100644 --- a/src/borg/crypto/_crypto_helpers.h +++ b/src/borg/crypto/_crypto_helpers.h @@ -2,14 +2,8 @@ #include #include -#include #if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) HMAC_CTX *HMAC_CTX_new(void); void HMAC_CTX_free(HMAC_CTX *ctx); #endif - - -#if !defined(LIBRESSL_VERSION_NUMBER) -#define LIBRESSL_VERSION_NUMBER 0 -#endif diff --git a/src/borg/crypto/low_level.pyx b/src/borg/crypto/low_level.pyx index c40df8a2d..9d8ac0ca0 100644 --- a/src/borg/crypto/low_level.pyx +++ b/src/borg/crypto/low_level.pyx @@ -102,15 +102,11 @@ cdef extern from "openssl/hmac.h": cdef extern from "_crypto_helpers.h": long OPENSSL_VERSION_NUMBER - long LIBRESSL_VERSION_NUMBER HMAC_CTX *HMAC_CTX_new() void HMAC_CTX_free(HMAC_CTX *a) -openssl10 = OPENSSL_VERSION_NUMBER < 0x10100000 or LIBRESSL_VERSION_NUMBER - - import struct _int = struct.Struct('>I')