aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-05-13 15:14:06 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-05-13 15:14:06 -0400
commit2c9ff679f79f919a965ee99e12dceea520abddfd (patch)
treebe07bafe0cf3f329d41561c33c57400e9ca70d75 /src
parent6caa5bbecad4479593bdaf7d8775d5af4e1717b4 (diff)
parentcec80a15b21e69c6e91fbfcbd2211fe87ceb93a9 (diff)
downloadcryptography-2c9ff679f79f919a965ee99e12dceea520abddfd.tar.gz
cryptography-2c9ff679f79f919a965ee99e12dceea520abddfd.tar.bz2
cryptography-2c9ff679f79f919a965ee99e12dceea520abddfd.zip
Merge pull request #1945 from reaperhulk/add-ssl-ctx-set-tlsext-status-arg
add SSL_set_tlsext_status_arg support
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/hazmat/bindings/openssl/ssl.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/cryptography/hazmat/bindings/openssl/ssl.py b/src/cryptography/hazmat/bindings/openssl/ssl.py
index c12624bc..5445f3c9 100644
--- a/src/cryptography/hazmat/bindings/openssl/ssl.py
+++ b/src/cryptography/hazmat/bindings/openssl/ssl.py
@@ -331,6 +331,7 @@ long SSL_set_tlsext_status_ocsp_resp(SSL *, unsigned char *, int);
long SSL_get_tlsext_status_ocsp_resp(SSL *, const unsigned char **);
long SSL_set_tlsext_status_type(SSL *, long);
long SSL_CTX_set_tlsext_status_cb(SSL_CTX *, int(*)(SSL *, void *));
+long SSL_CTX_set_tlsext_status_arg(SSL_CTX *, void *);
long SSL_session_reused(SSL *);
@@ -434,6 +435,7 @@ static const long Cryptography_HAS_TLSEXT_STATUS_REQ_CB = 1;
#else
static const long Cryptography_HAS_TLSEXT_STATUS_REQ_CB = 0;
long (*SSL_CTX_set_tlsext_status_cb)(SSL_CTX *, int(*)(SSL *, void *)) = NULL;
+long (*SSL_CTX_set_tlsext_status_arg)(SSL_CTX *, void *) = NULL;
#endif
#ifdef SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP
@@ -639,6 +641,7 @@ CONDITIONAL_NAMES = {
"Cryptography_HAS_TLSEXT_STATUS_REQ_CB": [
"SSL_CTX_set_tlsext_status_cb",
+ "SSL_CTX_set_tlsext_status_arg"
],
"Cryptography_HAS_STATUS_REQ_OCSP_RESP": [