aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2019-11-23 01:24:20 +0100
committerAlex Gaynor <alex.gaynor@gmail.com>2019-11-22 19:24:20 -0500
commit0538ca640c980f5a8fa75afbc916ad5d9ee793c9 (patch)
tree0c844e7bdfd6583c28d20585acd9ed568970ef76 /src
parent2bc47fe2fd244236f3d33b507c11f1b146650ea4 (diff)
downloadcryptography-0538ca640c980f5a8fa75afbc916ad5d9ee793c9.tar.gz
cryptography-0538ca640c980f5a8fa75afbc916ad5d9ee793c9.tar.bz2
cryptography-0538ca640c980f5a8fa75afbc916ad5d9ee793c9.zip
add SSL_CTX_get0_param (#5070)
Diffstat (limited to 'src')
-rw-r--r--src/_cffi_src/openssl/ssl.py2
-rw-r--r--src/cryptography/hazmat/bindings/openssl/_conditional.py1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py
index 4e91823c..59ff35ad 100644
--- a/src/_cffi_src/openssl/ssl.py
+++ b/src/_cffi_src/openssl/ssl.py
@@ -196,6 +196,7 @@ int SSL_get_ex_data_X509_STORE_CTX_idx(void);
/* Added in 1.0.2 */
X509_VERIFY_PARAM *SSL_get0_param(SSL *);
+X509_VERIFY_PARAM *SSL_CTX_get0_param(SSL_CTX *);
int SSL_use_certificate(SSL *, X509 *);
int SSL_use_certificate_ASN1(SSL *, const unsigned char *, int);
@@ -655,6 +656,7 @@ static const long Cryptography_HAS_NEXTPROTONEG = 1;
/* SSL_get0_param was added in OpenSSL 1.0.2. */
#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 && !CRYPTOGRAPHY_IS_LIBRESSL
X509_VERIFY_PARAM *(*SSL_get0_param)(SSL *) = NULL;
+X509_VERIFY_PARAM *(*SSL_CTX_get0_param)(SSL_CTX *) = NULL;
#else
#endif
diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py
index a39bb668..a293fb09 100644
--- a/src/cryptography/hazmat/bindings/openssl/_conditional.py
+++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py
@@ -99,6 +99,7 @@ def cryptography_has_102_verification_params():
"X509_VERIFY_PARAM_set1_ip_asc",
"X509_VERIFY_PARAM_set_hostflags",
"SSL_get0_param",
+ "SSL_CTX_get0_param",
"X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT",
"X509_CHECK_FLAG_NO_WILDCARDS",
"X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS",