diff options
| author | cyli <cyli@twistedmatrix.com> | 2013-12-15 21:02:52 -0800 |
|---|---|---|
| committer | cyli <cyli@twistedmatrix.com> | 2013-12-20 13:39:45 -0800 |
| commit | 4ba8ea6c962d0c4277b7c46c401a93db708e0378 (patch) | |
| tree | 52d60998d15f86ccf833dcf7fea82fbc6d1edd56 | |
| parent | 6238b0a46255440e322b4403cd37330d1616c7ff (diff) | |
| download | cryptography-4ba8ea6c962d0c4277b7c46c401a93db708e0378.tar.gz cryptography-4ba8ea6c962d0c4277b7c46c401a93db708e0378.tar.bz2 cryptography-4ba8ea6c962d0c4277b7c46c401a93db708e0378.zip | |
Oops, change to Cryptography_, not CRYPTOPGRAPHY_ (screaming). Also remove SSL_clear_options which is not in 0.9.8.
| -rw-r--r-- | cryptography/hazmat/backends/openssl/ssl.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/cryptography/hazmat/backends/openssl/ssl.py b/cryptography/hazmat/backends/openssl/ssl.py index 89b2c5ae..7e7de5ce 100644 --- a/cryptography/hazmat/backends/openssl/ssl.py +++ b/cryptography/hazmat/backends/openssl/ssl.py @@ -17,10 +17,10 @@ INCLUDES = """ TYPES = """ /* Internally invented symbol to tell us if SSLv2 is supported */ -static const int CRYPTOGRAPHY_NO_SSL2; +static const int Cryptography_NO_SSL2; /* Internally invented symbol to tell us if SNI is supported */ -static const int CRYPTOGRAPHY_TLSEXT_HOSTNAME; +static const int Cryptography_TLSEXT_HOSTNAME; static const int SSL_FILETYPE_PEM; static const int SSL_FILETYPE_ASN1; @@ -190,7 +190,6 @@ long SSL_set_mode(SSL *, long); long SSL_get_mode(SSL *); long SSL_set_options(SSL *, long); -long SSL_clear_options(SSL *, long); long SSL_get_options(SSL *); int SSL_want_read(const SSL *); @@ -245,18 +244,18 @@ void SSL_CTX_set_tlsext_servername_callback( CUSTOMIZATIONS = """ #ifdef OPENSSL_NO_SSL2 -static const int CRYPTOGRAPHY_NO_SSL2 = 1; +static const int Cryptography_NO_SSL2 = 1; SSL_METHOD* (*SSLv2_method)() = NULL; SSL_METHOD* (*SSLv2_client_method)() = NULL; SSL_METHOD* (*SSLv2_server_method)() = NULL; #else -static const int CRYPTOGRAPHY_NO_SSL2 = 0; +static const int Cryptography_NO_SSL2 = 0; #endif #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME -static const int CRYPTOGRAPHY_TLSEXT_HOSTNAME = 1; +static const int Cryptography_TLSEXT_HOSTNAME = 1; #else -static const int CRYPTOGRAPHY_TLSEXT_HOSTNAME = 0; +static const int Cryptography_TLSEXT_HOSTNAME = 0; void (*SSL_set_tlsext_host_name)(SSL *, char *) = NULL; const char* (*SSL_get_servername)(const SSL *, const int) = NULL; void (*SSL_CTX_set_tlsext_servername_callback)( |