diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-04-04 14:50:15 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-04-04 14:50:15 -0500 |
| commit | cff1fa94926e86219d7db94addc90499caa3de43 (patch) | |
| tree | f62091be356ef09d8967e9ee9b0596773c0cd4d9 | |
| parent | 6338ad8ebca535acff526c1a41dddb80efd51ccc (diff) | |
| parent | 7e573a308901816573656719183ec954cc5fbb50 (diff) | |
| download | cryptography-cff1fa94926e86219d7db94addc90499caa3de43.tar.gz cryptography-cff1fa94926e86219d7db94addc90499caa3de43.tar.bz2 cryptography-cff1fa94926e86219d7db94addc90499caa3de43.zip | |
Merge pull request #1824 from reaperhulk/no-comp
support openssl no-comp on linux/os x
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/ssl.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/cryptography/hazmat/bindings/openssl/ssl.py b/src/cryptography/hazmat/bindings/openssl/ssl.py index bc4b2e79..d680c3a5 100644 --- a/src/cryptography/hazmat/bindings/openssl/ssl.py +++ b/src/cryptography/hazmat/bindings/openssl/ssl.py @@ -546,11 +546,7 @@ static const long Cryptography_HAS_ALPN = 0; #else static const long Cryptography_HAS_ALPN = 1; #endif -/* LibreSSL has removed support for compression, and with it the - * COMP_METHOD use in ssl.h. This is a hack to make the function types - * in this code match those in ssl.h. - */ -#ifdef LIBRESSL_VERSION_NUMBER +#if defined(OPENSSL_NO_COMP) || defined(LIBRESSL_VERSION_NUMBER) static const long Cryptography_HAS_COMPRESSION = 0; typedef void COMP_METHOD; #else |