diff options
| author | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2013-12-29 14:13:59 -0500 |
|---|---|---|
| committer | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2013-12-29 14:13:59 -0500 |
| commit | 9236a340b5abb008b6bc06ecfe4540c958d5af76 (patch) | |
| tree | 59f4fe7f5283d956ffa2bddf8611feeece83bc06 | |
| parent | e951cbc50cf2d159d520e9c7a46749e25c9b219b (diff) | |
| parent | 5132c2f812ec8df0b4dcadfa02d93dd6f9103de3 (diff) | |
| download | cryptography-9236a340b5abb008b6bc06ecfe4540c958d5af76.tar.gz cryptography-9236a340b5abb008b6bc06ecfe4540c958d5af76.tar.bz2 cryptography-9236a340b5abb008b6bc06ecfe4540c958d5af76.zip | |
merge origin/master
| -rw-r--r-- | cryptography/hazmat/backends/openssl/ssl.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/cryptography/hazmat/backends/openssl/ssl.py b/cryptography/hazmat/backends/openssl/ssl.py index 6afe3a9d..cc3b3fe6 100644 --- a/cryptography/hazmat/backends/openssl/ssl.py +++ b/cryptography/hazmat/backends/openssl/ssl.py @@ -36,6 +36,8 @@ static const int Cryptography_HAS_RELEASE_BUFFERS; */ static const int Cryptography_HAS_OP_NO_COMPRESSION; +static const int Cryptography_HAS_SSL_OP_MSIE_SSLV2_RSA_PADDING; + static const int SSL_FILETYPE_PEM; static const int SSL_FILETYPE_ASN1; static const int SSL_ERROR_NONE; @@ -60,6 +62,7 @@ static const int SSL_OP_NETSCAPE_CHALLENGE_BUG; static const int SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG; static const int SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG; static const int SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER; +static const int SSL_OP_MSIE_SSLV2_RSA_PADDING; static const int SSL_OP_SSLEAY_080_CLIENT_DH_BUG; static const int SSL_OP_TLS_D5_BUG; static const int SSL_OP_TLS_BLOCK_PADDING_BUG; @@ -334,6 +337,12 @@ static const int SSL_OP_NO_TLSv1_2 = 0; SSL_METHOD* (*TLSv1_2_method)(void) = NULL; SSL_METHOD* (*TLSv1_2_client_method)(void) = NULL; SSL_METHOD* (*TLSv1_2_server_method)(void) = NULL; + +#ifdef SSL_OP_MSIE_SSLV2_RSA_PADDING +static const long Cryptography_HAS_SSL_OP_MSIE_SSLV2_RSA_PADDING = 1; +#else +static const long Cryptography_HAS_SSL_OP_MSIE_SSLV2_RSA_PADDING = 0; +const long SSL_OP_MSIE_SSLV2_RSA_PADDING = 0; #endif """ @@ -372,4 +381,7 @@ CONDITIONAL_NAMES = { "SSL_OP_NO_COMPRESSION", ], + "Cryptography_HAS_SSL_OP_MSIE_SSLV2_RSA_PADDING": [ + "SSL_OP_MSIE_SSLV2_RSA_PADDING", + ], } |