diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2017-03-14 09:05:50 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-03-14 09:05:50 -0400 |
| commit | 2c53403d4bd11be4f569ff73eee5bcb117a6452a (patch) | |
| tree | d038f1605b4f9c9421a05d4fb3dc18aa9dcbd478 | |
| parent | 3017c33ed73bba54d2603db90f1e3547b8f012b5 (diff) | |
| download | cryptography-2c53403d4bd11be4f569ff73eee5bcb117a6452a.tar.gz cryptography-2c53403d4bd11be4f569ff73eee5bcb117a6452a.tar.bz2 cryptography-2c53403d4bd11be4f569ff73eee5bcb117a6452a.zip | |
Removed some unused ifdefs from openssl bindings (#3448)
| -rw-r--r-- | src/_cffi_src/openssl/evp.py | 7 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/ssl.py | 19 | ||||
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/_conditional.py | 19 |
3 files changed, 0 insertions, 45 deletions
diff --git a/src/_cffi_src/openssl/evp.py b/src/_cffi_src/openssl/evp.py index 6582882e..18d6d624 100644 --- a/src/_cffi_src/openssl/evp.py +++ b/src/_cffi_src/openssl/evp.py @@ -173,14 +173,7 @@ int EVP_PBE_scrypt(const char *, size_t, const unsigned char *, size_t, """ CUSTOMIZATIONS = """ -#ifdef EVP_CTRL_GCM_SET_TAG const long Cryptography_HAS_GCM = 1; -#else -const long Cryptography_HAS_GCM = 0; -const long EVP_CTRL_GCM_GET_TAG = -1; -const long EVP_CTRL_GCM_SET_TAG = -1; -const long EVP_CTRL_GCM_SET_IVLEN = -1; -#endif const long Cryptography_HAS_PBKDF2_HMAC = 1; const long Cryptography_HAS_PKEY_CTX = 1; diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py index 7a041e5d..4daa4d81 100644 --- a/src/_cffi_src/openssl/ssl.py +++ b/src/_cffi_src/openssl/ssl.py @@ -519,22 +519,8 @@ static const long Cryptography_HAS_RELEASE_BUFFERS = 0; const long SSL_MODE_RELEASE_BUFFERS = 0; #endif -#ifdef SSL_OP_NO_COMPRESSION static const long Cryptography_HAS_OP_NO_COMPRESSION = 1; -#else -static const long Cryptography_HAS_OP_NO_COMPRESSION = 0; -const long SSL_OP_NO_COMPRESSION = 0; -#endif - -#ifdef SSL_OP_NO_TLSv1_1 static const long Cryptography_HAS_TLSv1_1 = 1; -#else -static const long Cryptography_HAS_TLSv1_1 = 0; -static const long SSL_OP_NO_TLSv1_1 = 0; -SSL_METHOD* (*TLSv1_1_method)(void) = NULL; -SSL_METHOD* (*TLSv1_1_client_method)(void) = NULL; -SSL_METHOD* (*TLSv1_1_server_method)(void) = NULL; -#endif #ifdef SSL_OP_NO_TLSv1_2 static const long Cryptography_HAS_TLSv1_2 = 1; @@ -557,12 +543,7 @@ const long SSL_OP_MSIE_SSLV2_RSA_PADDING = 0; long (*SSL_CTX_set_tmp_ecdh)(SSL_CTX *, EC_KEY *) = NULL; #endif -#ifdef SSL_OP_NO_TICKET static const long Cryptography_HAS_SSL_OP_NO_TICKET = 1; -#else -static const long Cryptography_HAS_SSL_OP_NO_TICKET = 0; -const long SSL_OP_NO_TICKET = 0; -#endif static const long Cryptography_HAS_SSL_SET_SSL_CTX = 1; diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py index 5d377d18..c95a9fe0 100644 --- a/src/cryptography/hazmat/bindings/openssl/_conditional.py +++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py @@ -182,11 +182,6 @@ CONDITIONAL_NAMES = { "Cryptography_HAS_RSA_R_PKCS_DECODING_ERROR": [ "RSA_R_PKCS_DECODING_ERROR" ], - "Cryptography_HAS_GCM": [ - "EVP_CTRL_GCM_GET_TAG", - "EVP_CTRL_GCM_SET_TAG", - "EVP_CTRL_GCM_SET_IVLEN", - ], "Cryptography_HAS_EGD": [ "RAND_egd", "RAND_egd_bytes", @@ -195,12 +190,6 @@ CONDITIONAL_NAMES = { "Cryptography_HAS_RSA_OAEP_MD": [ "EVP_PKEY_CTX_set_rsa_oaep_md", ], - "Cryptography_HAS_TLSv1_1": [ - "SSL_OP_NO_TLSv1_1", - "TLSv1_1_method", - "TLSv1_1_server_method", - "TLSv1_1_client_method", - ], "Cryptography_HAS_TLSv1_2": [ "SSL_OP_NO_TLSv1_2", @@ -219,18 +208,10 @@ CONDITIONAL_NAMES = { "SSL_MODE_RELEASE_BUFFERS", ], - "Cryptography_HAS_OP_NO_COMPRESSION": [ - "SSL_OP_NO_COMPRESSION", - ], - "Cryptography_HAS_SSL_OP_MSIE_SSLV2_RSA_PADDING": [ "SSL_OP_MSIE_SSLV2_RSA_PADDING", ], - "Cryptography_HAS_SSL_OP_NO_TICKET": [ - "SSL_OP_NO_TICKET", - ], - "Cryptography_HAS_NETBSD_D1_METH": [ "DTLSv1_method", ], |