diff options
author | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2013-12-23 15:12:38 -0500 |
---|---|---|
committer | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2013-12-23 15:12:38 -0500 |
commit | e73e89b2d8c1dafdb0d07ac924e1868f589f2e32 (patch) | |
tree | ab46a032eb0540b3c72712c81562d724eb240004 | |
parent | 7b136459af582427d7f738a905aa3cfaa5b4c195 (diff) | |
parent | 22af23ebbbee831f8d9874ebf9080b4b5ed545b7 (diff) | |
download | cryptography-e73e89b2d8c1dafdb0d07ac924e1868f589f2e32.tar.gz cryptography-e73e89b2d8c1dafdb0d07ac924e1868f589f2e32.tar.bz2 cryptography-e73e89b2d8c1dafdb0d07ac924e1868f589f2e32.zip |
Merge remote-tracking branch 'mine/misc-simple-extras-with-optionals' into pyopenssl-test_crypto-with-optionals
-rw-r--r-- | cryptography/hazmat/backends/openssl/ssl.py | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/cryptography/hazmat/backends/openssl/ssl.py b/cryptography/hazmat/backends/openssl/ssl.py index a1acde38..3fd0bf23 100644 --- a/cryptography/hazmat/backends/openssl/ssl.py +++ b/cryptography/hazmat/backends/openssl/ssl.py @@ -27,6 +27,11 @@ static const int Cryptography_HAS_TLSEXT_HOSTNAME; */ static const int Cryptography_HAS_RELEASE_BUFFERS; +/* Internally invented symbol to tell us if SSL_OP_NO_COMPRESSION is + * supported + */ +static const int Cryptography_HAS_OP_NO_COMPRESSION; + static const int SSL_FILETYPE_PEM; static const int SSL_FILETYPE_ASN1; static const int SSL_ERROR_NONE; @@ -275,6 +280,13 @@ static const int Cryptography_HAS_RELEASE_BUFFERS = 1; static const int Cryptography_HAS_RELEASE_BUFFERS = 0; const int SSL_MODE_RELEASE_BUFFERS = 0; #endif + +#ifdef SSL_OP_NO_COMPRESSION +static const int Cryptography_HAS_OP_NO_COMPRESSION = 1; +#else +static const int Cryptography_HAS_OP_NO_COMPRESSION = 0; +const int SSL_OP_NO_COMPRESSION = 0; +#endif """ CONDITIONAL_NAMES = { @@ -294,4 +306,8 @@ CONDITIONAL_NAMES = { "SSL_MODE_RELEASE_BUFFERS", ], + "Cryptography_HAS_OP_NO_COMPRESSION": [ + "SSL_OP_NO_COMPRESSION", + ], + } |