From b5c1bf034bb119853c08540e2895b760566eaa0f Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sun, 28 Dec 2014 13:45:59 -0700 Subject: [PATCH] Revert "Fixed #1494 -- switch which define we look for for SSLv3 disabled. We're now using the same one as CPython." This reverts commit facea9a7861ac1ecc7948474766cae0f842b3469. --- src/cryptography/hazmat/bindings/openssl/ssl.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cryptography/hazmat/bindings/openssl/ssl.py b/src/cryptography/hazmat/bindings/openssl/ssl.py index 9a48f5868d73..91ae36ac8754 100644 --- a/src/cryptography/hazmat/bindings/openssl/ssl.py +++ b/src/cryptography/hazmat/bindings/openssl/ssl.py @@ -15,7 +15,7 @@ * Internally invented symbols to tell which versions of SSL/TLS are supported. */ static const long Cryptography_HAS_SSL2; -static const long Cryptography_HAS_SSL3; +static const long Cryptography_HAS_SSL3_METHOD; static const long Cryptography_HAS_TLSv1_1; static const long Cryptography_HAS_TLSv1_2; static const long Cryptography_HAS_SECURE_RENEGOTIATION; @@ -387,13 +387,13 @@ static const long Cryptography_HAS_SSL2 = 1; #endif -#ifdef OPENSSL_NO_SSL3 -static const long Cryptography_HAS_SSL3 = 0; +#ifdef OPENSSL_NO_SSL3_METHOD +static const long Cryptography_HAS_SSL3_METHOD = 0; SSL_METHOD* (*SSLv3_method)(void) = NULL; SSL_METHOD* (*SSLv3_client_method)(void) = NULL; SSL_METHOD* (*SSLv3_server_method)(void) = NULL; #else -static const long Cryptography_HAS_SSL3 = 1; +static const long Cryptography_HAS_SSL3_METHOD = 1; #endif #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME @@ -566,7 +566,7 @@ "SSLv2_server_method", ], - "Cryptography_HAS_SSL3": [ + "Cryptography_HAS_SSL3_METHOD": [ "SSLv3_method", "SSLv3_client_method", "SSLv3_server_method",