diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2022-09-27 19:55:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-27 19:55:50 -0500 |
| commit | 1f3420a0813f4ef6972f2d8d64ca88002b3e1246 (patch) | |
| tree | bc7aabbf88f53094d801436741e334072f8e1446 /src/_cffi_src | |
| parent | baa1227e4c066d61f0589c753ee9da859e68035c (diff) | |
| download | cryptography-1f3420a0813f4ef6972f2d8d64ca88002b3e1246.tar.gz | |
fixes #7653 -- handle OPENSSL_cleanup existing on LibreSSL 3.6.0 (#7654)
Diffstat (limited to 'src/_cffi_src')
| -rw-r--r-- | src/_cffi_src/openssl/crypto.py | 2 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/cryptography.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/_cffi_src/openssl/crypto.py b/src/_cffi_src/openssl/crypto.py index 5a1ffcc0e..cbef38804 100644 --- a/src/_cffi_src/openssl/crypto.py +++ b/src/_cffi_src/openssl/crypto.py @@ -74,7 +74,7 @@ CUSTOMIZATIONS = """ # define OPENSSL_DIR SSLEAY_DIR #endif -#if CRYPTOGRAPHY_IS_LIBRESSL +#if CRYPTOGRAPHY_LIBRESSL_LESS_THAN_360 static const long Cryptography_HAS_OPENSSL_CLEANUP = 0; void (*OPENSSL_cleanup)(void) = NULL; #else diff --git a/src/_cffi_src/openssl/cryptography.py b/src/_cffi_src/openssl/cryptography.py index 605e62db5..c559401dd 100644 --- a/src/_cffi_src/openssl/cryptography.py +++ b/src/_cffi_src/openssl/cryptography.py @@ -43,9 +43,12 @@ INCLUDES = """ #if CRYPTOGRAPHY_IS_LIBRESSL #define CRYPTOGRAPHY_LIBRESSL_LESS_THAN_350 \ (LIBRESSL_VERSION_NUMBER < 0x3050000f) +#define CRYPTOGRAPHY_LIBRESSL_LESS_THAN_360 \ + (LIBRESSL_VERSION_NUMBER < 0x3060000f) #else #define CRYPTOGRAPHY_LIBRESSL_LESS_THAN_350 (0) +#define CRYPTOGRAPHY_LIBRESSL_LESS_THAN_360 (0) #endif #if OPENSSL_VERSION_NUMBER < 0x10101000 |