diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-12-28 14:01:14 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-12-28 14:01:14 -0800 |
| commit | ad3947a820a5ebde80578106f7f97d628acbbd77 (patch) | |
| tree | fc595e87f919fb7e2d7037e77abbab03b3aafef3 | |
| parent | 148b5a87d3aa6225bfa862e77a51637171ca6b1b (diff) | |
| parent | 8ef080968ff266093c6b16f3785c1c16a20bc6a7 (diff) | |
| download | cryptography-ad3947a820a5ebde80578106f7f97d628acbbd77.tar.gz cryptography-ad3947a820a5ebde80578106f7f97d628acbbd77.tar.bz2 cryptography-ad3947a820a5ebde80578106f7f97d628acbbd77.zip | |
Merge pull request #1585 from reaperhulk/revert-1512
Revert "Fixed #1494 -- switch which define we look for for SSLv3 disable...
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/ssl.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cryptography/hazmat/bindings/openssl/ssl.py b/src/cryptography/hazmat/bindings/openssl/ssl.py index 9a48f586..91ae36ac 100644 --- a/src/cryptography/hazmat/bindings/openssl/ssl.py +++ b/src/cryptography/hazmat/bindings/openssl/ssl.py @@ -15,7 +15,7 @@ TYPES = """ * 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 @@ SSL_METHOD* (*SSLv2_server_method)(void) = NULL; 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 @@ CONDITIONAL_NAMES = { "SSLv2_server_method", ], - "Cryptography_HAS_SSL3": [ + "Cryptography_HAS_SSL3_METHOD": [ "SSLv3_method", "SSLv3_client_method", "SSLv3_server_method", |