aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-05-11 13:06:13 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2014-05-11 13:06:13 -0700
commit4470e1d2ec1dbf854edfa2749c63e9af9979de96 (patch)
tree31c0f054dd6e1e2c8aac604b5e6c3935621b422b
parent9263d5ff5e62ce4adf5d959fecb3b1115f8216cc (diff)
parent1dac4440e24a3290309387d9d384dbd6fcf74826 (diff)
downloadcryptography-4470e1d2ec1dbf854edfa2749c63e9af9979de96.tar.gz
cryptography-4470e1d2ec1dbf854edfa2749c63e9af9979de96.tar.bz2
cryptography-4470e1d2ec1dbf854edfa2749c63e9af9979de96.zip
Merge pull request #1035 from phibos/get_comp_name
Function to get current compression and expansion
-rw-r--r--cryptography/hazmat/bindings/openssl/ssl.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/cryptography/hazmat/bindings/openssl/ssl.py b/cryptography/hazmat/bindings/openssl/ssl.py
index cd8fa1cf..94b96d98 100644
--- a/cryptography/hazmat/bindings/openssl/ssl.py
+++ b/cryptography/hazmat/bindings/openssl/ssl.py
@@ -159,6 +159,7 @@ static const long TLSEXT_NAMETYPE_host_name;
typedef ... SSL_CIPHER;
typedef ... Cryptography_STACK_OF_SSL_CIPHER;
+typedef ... COMP_METHOD;
"""
FUNCTIONS = """
@@ -198,6 +199,10 @@ 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);