Merge pull request #1587 from reaperhulk/backport-no-ssl3-fix

backport OPENSSL_NO_SSL3 change to 0.7.x branch
pyca · Dec 29, 2014 · c8affc3 · c8affc3
2 parents 4597edf + b5c1bf0
commit c8affc3
Showing 1 changed file with 5 additions and 5 deletions.
diff --git 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",