diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-02-19 14:06:39 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-02-19 14:06:39 -0600 |
| commit | 8996f672f2c2fa49ecb59841e0b6bfea17e8ce13 (patch) | |
| tree | 8b3bbd0a5b3194b44d6291f00ba717b693e01a87 /src | |
| parent | c965f0ad5b6cbb8920521fdb2ecb79e851af7d19 (diff) | |
| download | cryptography-8996f672f2c2fa49ecb59841e0b6bfea17e8ce13.tar.gz cryptography-8996f672f2c2fa49ecb59841e0b6bfea17e8ce13.tar.bz2 cryptography-8996f672f2c2fa49ecb59841e0b6bfea17e8ce13.zip | |
move some compression things around for libre
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/ssl.py | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/cryptography/hazmat/bindings/openssl/ssl.py b/src/cryptography/hazmat/bindings/openssl/ssl.py index 1a6f1c20..bc4b2e79 100644 --- a/src/cryptography/hazmat/bindings/openssl/ssl.py +++ b/src/cryptography/hazmat/bindings/openssl/ssl.py @@ -19,6 +19,7 @@ static const long Cryptography_HAS_SSL3_METHOD; static const long Cryptography_HAS_TLSv1_1; static const long Cryptography_HAS_TLSv1_2; static const long Cryptography_HAS_SECURE_RENEGOTIATION; +static const long Cryptography_HAS_COMPRESSION; /* Internally invented symbol to tell us if SNI is supported */ static const long Cryptography_HAS_TLSEXT_HOSTNAME; @@ -189,10 +190,6 @@ int SSL_shutdown(SSL *); const char *SSL_get_cipher_list(const SSL *, int); Cryptography_STACK_OF_SSL_CIPHER *SSL_get_ciphers(const SSL *); -const COMP_METHOD *SSL_get_current_compression(SSL *); -const COMP_METHOD *SSL_get_current_expansion(SSL *); -const char *SSL_COMP_get_name(const COMP_METHOD *); - /* context */ void SSL_CTX_free(SSL_CTX *); long SSL_CTX_set_timeout(SSL_CTX *, long); @@ -232,6 +229,11 @@ size_t SSL_get_peer_finished(const SSL *, void *, size_t); """ MACROS = """ +/* not macros, but will be conditionally bound so can't live in functions */ +const COMP_METHOD *SSL_get_current_compression(SSL *); +const COMP_METHOD *SSL_get_current_expansion(SSL *); +const char *SSL_COMP_get_name(const COMP_METHOD *); + unsigned long SSL_set_mode(SSL *, unsigned long); unsigned long SSL_get_mode(SSL *); @@ -549,7 +551,10 @@ static const long Cryptography_HAS_ALPN = 1; * in this code match those in ssl.h. */ #ifdef LIBRESSL_VERSION_NUMBER +static const long Cryptography_HAS_COMPRESSION = 0; typedef void COMP_METHOD; +#else +static const long Cryptography_HAS_COMPRESSION = 1; #endif """ @@ -634,5 +639,11 @@ CONDITIONAL_NAMES = { "SSL_set_alpn_protos", "SSL_CTX_set_alpn_select_cb", "SSL_get0_alpn_selected", + ], + + "Cryptography_HAS_COMPRESSION": [ + "SSL_get_current_compression", + "SSL_get_current_expansion", + "SSL_COMP_get_name", ] } |