diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2022-09-06 23:04:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-07 03:04:09 +0000 |
| commit | 9547b311ff84807db63cb7c0044f55209eeb5e79 (patch) | |
| tree | 08a0594fb43acce45ea81ebbbad79744d2ee6876 /src/_cffi_src | |
| parent | 2cae24a93b5c680c2b51e2c44a32ee922cb99d3e (diff) | |
| download | cryptography-9547b311ff84807db63cb7c0044f55209eeb5e79.tar.gz | |
Increase our minimum LibreSSL. (#7571)
OpenBSD 7.0 ships 3.4, and Alpine 3.14 ships 3.3.6
Diffstat (limited to 'src/_cffi_src')
| -rw-r--r-- | src/_cffi_src/openssl/cryptography.py | 6 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/ssl.py | 4 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/x509_vfy.py | 10 |
3 files changed, 0 insertions, 20 deletions
diff --git a/src/_cffi_src/openssl/cryptography.py b/src/_cffi_src/openssl/cryptography.py index b5d4eb3cb..e8b4489ca 100644 --- a/src/_cffi_src/openssl/cryptography.py +++ b/src/_cffi_src/openssl/cryptography.py @@ -39,18 +39,12 @@ INCLUDES = """ #endif #if CRYPTOGRAPHY_IS_LIBRESSL -#define CRYPTOGRAPHY_LIBRESSL_LESS_THAN_322 \ - (LIBRESSL_VERSION_NUMBER < 0x3020200f) -#define CRYPTOGRAPHY_LIBRESSL_LESS_THAN_332 \ - (LIBRESSL_VERSION_NUMBER < 0x3030200f) #define CRYPTOGRAPHY_LIBRESSL_LESS_THAN_340 \ (LIBRESSL_VERSION_NUMBER < 0x3040000f) #define CRYPTOGRAPHY_LIBRESSL_LESS_THAN_350 \ (LIBRESSL_VERSION_NUMBER < 0x3050000f) #else -#define CRYPTOGRAPHY_LIBRESSL_LESS_THAN_322 (0) -#define CRYPTOGRAPHY_LIBRESSL_LESS_THAN_332 (0) #define CRYPTOGRAPHY_LIBRESSL_LESS_THAN_340 (0) #define CRYPTOGRAPHY_LIBRESSL_LESS_THAN_350 (0) #endif diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py index cd1a78952..66305bca9 100644 --- a/src/_cffi_src/openssl/ssl.py +++ b/src/_cffi_src/openssl/ssl.py @@ -643,10 +643,6 @@ static const long TLS_ST_OK = 0; #endif #if CRYPTOGRAPHY_IS_LIBRESSL || CRYPTOGRAPHY_IS_BORINGSSL -#if CRYPTOGRAPHY_LIBRESSL_LESS_THAN_332 -static const long SSL_OP_NO_DTLSv1 = 0; -static const long SSL_OP_NO_DTLSv1_2 = 0; -#endif long (*DTLS_set_link_mtu)(SSL *, long) = NULL; long (*DTLS_get_link_min_mtu)(SSL *) = NULL; #endif diff --git a/src/_cffi_src/openssl/x509_vfy.py b/src/_cffi_src/openssl/x509_vfy.py index 799751548..5cb6a3f33 100644 --- a/src/_cffi_src/openssl/x509_vfy.py +++ b/src/_cffi_src/openssl/x509_vfy.py @@ -18,7 +18,6 @@ typedef STACK_OF(X509_OBJECT) Cryptography_STACK_OF_X509_OBJECT; """ TYPES = """ -static const long Cryptography_HAS_110_VERIFICATION_PARAMS; static const long Cryptography_HAS_X509_STORE_CTX_GET_ISSUER; typedef ... Cryptography_STACK_OF_ASN1_OBJECT; @@ -218,15 +217,6 @@ void X509_STORE_set_get_issuer(X509_STORE *, X509_STORE_CTX_get_issuer_fn); """ CUSTOMIZATIONS = """ -#if CRYPTOGRAPHY_IS_LIBRESSL && CRYPTOGRAPHY_LIBRESSL_LESS_THAN_322 -static const long Cryptography_HAS_110_VERIFICATION_PARAMS = 0; -#ifndef X509_CHECK_FLAG_NEVER_CHECK_SUBJECT -static const long X509_CHECK_FLAG_NEVER_CHECK_SUBJECT = 0; -#endif -#else -static const long Cryptography_HAS_110_VERIFICATION_PARAMS = 1; -#endif - #if CRYPTOGRAPHY_IS_LIBRESSL static const long Cryptography_HAS_X509_STORE_CTX_GET_ISSUER = 0; typedef void *X509_STORE_CTX_get_issuer_fn; |