diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-11-24 09:44:27 -1000 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-11-24 09:44:27 -1000 |
| commit | 04a3f1f2c4086c0d7162b6dd79b6332d9115b2c0 (patch) | |
| tree | fcb5eca0ad015ef836f95c2eb7bfa7d63f613bc6 | |
| parent | b88242678c5496e43ebd603fcfa44b8f2f9984cb (diff) | |
| parent | 12c9f3a007608c483c21bb92d080477928aaf9e5 (diff) | |
| download | cryptography-04a3f1f2c4086c0d7162b6dd79b6332d9115b2c0.tar.gz cryptography-04a3f1f2c4086c0d7162b6dd79b6332d9115b2c0.tar.bz2 cryptography-04a3f1f2c4086c0d7162b6dd79b6332d9115b2c0.zip | |
Merge pull request #1488 from alex/no-sslv3
Support compilation on platforms, such as debian expiremental, which are compiled without SSLv3
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/ssl.py | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/cryptography/hazmat/bindings/openssl/ssl.py b/src/cryptography/hazmat/bindings/openssl/ssl.py index 3d6fc425..1aed28d5 100644 --- a/src/cryptography/hazmat/bindings/openssl/ssl.py +++ b/src/cryptography/hazmat/bindings/openssl/ssl.py @@ -15,6 +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_TLSv1_1; static const long Cryptography_HAS_TLSv1_2; static const long Cryptography_HAS_SECURE_RENEGOTIATION; @@ -384,6 +385,15 @@ 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; +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; +#endif + #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME static const long Cryptography_HAS_TLSEXT_HOSTNAME = 1; #else @@ -554,6 +564,12 @@ CONDITIONAL_NAMES = { "SSLv2_server_method", ], + "Cryptography_HAS_SSL3_METHOD": [ + "SSLv3_method", + "SSLv3_client_method", + "SSLv3_server_method", + ], + "Cryptography_HAS_TLSEXT_HOSTNAME": [ "SSL_set_tlsext_host_name", "SSL_get_servername", |