diff options
| author | Nick Bastin <nick.bastin@gmail.com> | 2015-12-19 10:43:13 -0800 |
|---|---|---|
| committer | Nick Bastin <nick.bastin@gmail.com> | 2015-12-19 10:43:13 -0800 |
| commit | 4594773bdc8145aa599e18a2119948d061b50b13 (patch) | |
| tree | cb1b58308edd44293751d97ccb71e33d1eb16e97 /src/_cffi_src | |
| parent | 06042de08fb9ff549b9c9cb7244e7f27ff57eece (diff) | |
| parent | e3f46c6d228161957e0549bfa838ba8791c1bb36 (diff) | |
| download | cryptography-4594773bdc8145aa599e18a2119948d061b50b13.tar.gz cryptography-4594773bdc8145aa599e18a2119948d061b50b13.tar.bz2 cryptography-4594773bdc8145aa599e18a2119948d061b50b13.zip | |
Merge pull request #1 from pyca/master
Sync
Diffstat (limited to 'src/_cffi_src')
| -rw-r--r-- | src/_cffi_src/openssl/ssl.py | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py index 83a7386f..64e4e2f0 100644 --- a/src/_cffi_src/openssl/ssl.py +++ b/src/_cffi_src/openssl/ssl.py @@ -301,15 +301,6 @@ unsigned long SSL_CTX_add_extra_chain_cert(SSL_CTX *, X509 *); /* methods */ -/* SSLv2 support is compiled out of some versions of OpenSSL. These will - * get special support when we generate the bindings so that if they are - * available they will be wrapped, but if they are not they won't cause - * problems (like link errors). - */ -const SSL_METHOD *SSLv2_method(void); -const SSL_METHOD *SSLv2_server_method(void); -const SSL_METHOD *SSLv2_client_method(void); - /* * TLSv1_1 and TLSv1_2 are recent additions. Only sufficiently new versions of * OpenSSL support them. @@ -441,14 +432,12 @@ const long SSL_OP_LEGACY_SERVER_CONNECT = 0; #else static const long Cryptography_HAS_SECURE_RENEGOTIATION = 1; #endif -#ifdef OPENSSL_NO_SSL2 + +/* Cryptography now compiles out all SSLv2 bindings. This exists to allow + * clients that use it to check for SSLv2 support to keep functioning as + * expected. + */ static const long Cryptography_HAS_SSL2 = 0; -SSL_METHOD* (*SSLv2_method)(void) = NULL; -SSL_METHOD* (*SSLv2_client_method)(void) = NULL; -SSL_METHOD* (*SSLv2_server_method)(void) = NULL; -#else -static const long Cryptography_HAS_SSL2 = 1; -#endif #ifdef OPENSSL_NO_SSL3_METHOD static const long Cryptography_HAS_SSL3_METHOD = 0; |