diff options
| author | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2013-12-29 14:15:13 -0500 |
|---|---|---|
| committer | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2013-12-29 14:15:13 -0500 |
| commit | d69cb49b273c47382ff135269903716729a06158 (patch) | |
| tree | 7984ea746bc0dd156ee0e8132426b686b095e49a | |
| parent | 6eb15b0925ccf504941b35685afea9eef09d937a (diff) | |
| download | cryptography-d69cb49b273c47382ff135269903716729a06158.tar.gz cryptography-d69cb49b273c47382ff135269903716729a06158.tar.bz2 cryptography-d69cb49b273c47382ff135269903716729a06158.zip | |
fix bogus merge
| -rw-r--r-- | cryptography/hazmat/backends/openssl/ssl.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cryptography/hazmat/backends/openssl/ssl.py b/cryptography/hazmat/backends/openssl/ssl.py index 48910573..d0d5ae2d 100644 --- a/cryptography/hazmat/backends/openssl/ssl.py +++ b/cryptography/hazmat/backends/openssl/ssl.py @@ -337,6 +337,7 @@ static const long 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; +#endif #ifdef SSL_OP_MSIE_SSLV2_RSA_PADDING static const long Cryptography_HAS_SSL_OP_MSIE_SSLV2_RSA_PADDING = 1; |