diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-12-09 21:00:26 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-12-09 21:00:26 -0600 |
| commit | cc927a248eb7dca939bfb460a835705d70850378 (patch) | |
| tree | e215aab9eb75635ca168f384876a28e970e64a0b | |
| parent | 68416c33d3868465f2485e4facae84900ad2c632 (diff) | |
| parent | facea9a7861ac1ecc7948474766cae0f842b3469 (diff) | |
| download | cryptography-cc927a248eb7dca939bfb460a835705d70850378.tar.gz cryptography-cc927a248eb7dca939bfb460a835705d70850378.tar.bz2 cryptography-cc927a248eb7dca939bfb460a835705d70850378.zip | |
Merge pull request #1512 from alex/change-debian-define
Fixed #1494 -- switch which define we look for for SSLv3 disabled. We're now using the same one as CPython.
| -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 1aed28d5..4a94ce03 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_METHOD; +static const long Cryptography_HAS_SSL3; static const long Cryptography_HAS_TLSv1_1; static const long Cryptography_HAS_TLSv1_2; static const long Cryptography_HAS_SECURE_RENEGOTIATION; @@ -385,13 +385,13 @@ SSL_METHOD* (*SSLv2_server_method)(void) = NULL; static const long Cryptography_HAS_SSL2 = 1; #endif -#ifdef OPENSSL_NO_SSL3_METHOD -static const long Cryptography_HAS_SSL3_METHOD = 0; +#ifdef OPENSSL_NO_SSL3 +static const long Cryptography_HAS_SSL3 = 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_METHOD = 1; +static const long Cryptography_HAS_SSL3 = 1; #endif #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME @@ -564,7 +564,7 @@ CONDITIONAL_NAMES = { "SSLv2_server_method", ], - "Cryptography_HAS_SSL3_METHOD": [ + "Cryptography_HAS_SSL3": [ "SSLv3_method", "SSLv3_client_method", "SSLv3_server_method", |