From 2c53403d4bd11be4f569ff73eee5bcb117a6452a Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Tue, 14 Mar 2017 09:05:50 -0400 Subject: Removed some unused ifdefs from openssl bindings (#3448) --- src/_cffi_src/openssl/evp.py | 7 ------- src/_cffi_src/openssl/ssl.py | 19 ------------------- 2 files changed, 26 deletions(-) (limited to 'src/_cffi_src') 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; -- cgit v1.2.3