diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-06-19 23:31:13 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-06-19 22:31:13 -0500 |
| commit | 6f143b693e1f687adb820658a5383057cc1f7e2f (patch) | |
| tree | cc000f6c6982cf3d2706d5590cc25549e5d03771 /src | |
| parent | b927426213ff6f528e5e3c877bbcdc28fa51f9fe (diff) | |
| download | cryptography-6f143b693e1f687adb820658a5383057cc1f7e2f.tar.gz cryptography-6f143b693e1f687adb820658a5383057cc1f7e2f.tar.bz2 cryptography-6f143b693e1f687adb820658a5383057cc1f7e2f.zip | |
Remove a few 0.9.8isms from the ssl bindings (#2998)
Diffstat (limited to 'src')
| -rw-r--r-- | src/_cffi_src/openssl/ssl.py | 22 | ||||
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/_conditional.py | 11 |
2 files changed, 0 insertions, 33 deletions
diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py index 8569661e..425fd8ac 100644 --- a/src/_cffi_src/openssl/ssl.py +++ b/src/_cffi_src/openssl/ssl.py @@ -649,14 +649,7 @@ static const long Cryptography_HAS_SSL_OP_NO_TICKET = 0; const long SSL_OP_NO_TICKET = 0; #endif -/* OpenSSL 0.9.8f+ */ -#if OPENSSL_VERSION_NUMBER >= 0x00908070L static const long Cryptography_HAS_SSL_SET_SSL_CTX = 1; -#else -static const long Cryptography_HAS_SSL_SET_SSL_CTX = 0; -static const long TLSEXT_NAMETYPE_host_name = 0; -SSL_CTX *(*SSL_set_SSL_CTX)(SSL *, SSL_CTX *) = NULL; -#endif /* NetBSD shipped without including d1_meth.c. This workaround checks to see if the version of NetBSD we're currently running on is old enough to @@ -753,24 +746,9 @@ static const long Cryptography_HAS_GET_SERVER_TMP_KEY = 0; long (*SSL_get_server_tmp_key)(SSL *, EVP_PKEY **) = NULL; #endif -/* Added in 0.9.8i */ -#if OPENSSL_VERSION_NUMBER < 0x0090809fL -int (*SSL_CTX_set_client_cert_engine)(SSL_CTX *, ENGINE *) = NULL; -static const long Cryptography_HAS_SSL_CTX_SET_CLIENT_CERT_ENGINE = 0; -# else static const long Cryptography_HAS_SSL_CTX_SET_CLIENT_CERT_ENGINE = 1; -#endif -/* SSL_CTX_clear_options() and SSL_clear_options() were first added in - * OpenSSL 0.9.8m but do not appear in some 0.9.9-dev versions such the - * 0.9.9 from "May 2008" that NetBSD 5.0 uses. */ -#if OPENSSL_VERSION_NUMBER >= 0x009080dfL && \ - OPENSSL_VERSION_NUMBER != 0x00909000L static const long Cryptography_HAS_SSL_CTX_CLEAR_OPTIONS = 1; -#else -unsigned long (*SSL_CTX_clear_options)(SSL_CTX *, unsigned long) = NULL; -static const long Cryptography_HAS_SSL_CTX_CLEAR_OPTIONS = 0; -#endif /* in OpenSSL 1.1.0 the SSL_ST values were renamed to TLS_ST and several were removed */ diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py index 90c57f18..3c5a5a57 100644 --- a/src/cryptography/hazmat/bindings/openssl/_conditional.py +++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py @@ -254,11 +254,6 @@ CONDITIONAL_NAMES = { "SSL_OP_NO_TICKET", ], - "Cryptography_HAS_SSL_SET_SSL_CTX": [ - "SSL_set_SSL_CTX", - "TLSEXT_NAMETYPE_host_name", - ], - "Cryptography_HAS_NETBSD_D1_METH": [ "DTLSv1_method", ], @@ -293,12 +288,6 @@ CONDITIONAL_NAMES = { "SSL_get_server_tmp_key", ], - "Cryptography_HAS_SSL_CTX_SET_CLIENT_CERT_ENGINE": [ - "SSL_CTX_set_client_cert_engine", - ], - "Cryptography_HAS_SSL_CTX_CLEAR_OPTIONS": [ - "SSL_CTX_clear_options", - ], "Cryptography_HAS_102_VERIFICATION_ERROR_CODES": [ 'X509_V_ERR_SUITE_B_INVALID_VERSION', 'X509_V_ERR_SUITE_B_INVALID_ALGORITHM', |