aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-08-27 14:40:16 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-08-27 14:40:16 -0400
commit8e1912bb0e2102e7e9341a2fb69ffaa2d3346157 (patch)
tree510e317a933a7ece8894371f4f44ce51775db6dd
parente87027f7ae7e4f79c365ca801d4d80cf64291961 (diff)
parent21569bf71e32ece2f5dc0dfc40373b7b95ea3167 (diff)
downloadcryptography-8e1912bb0e2102e7e9341a2fb69ffaa2d3346157.tar.gz
cryptography-8e1912bb0e2102e7e9341a2fb69ffaa2d3346157.tar.bz2
cryptography-8e1912bb0e2102e7e9341a2fb69ffaa2d3346157.zip
Merge pull request #2296 from reaperhulk/correct-my-review-mistake
add conditional removal for SET_CERT_CB
-rw-r--r--src/cryptography/hazmat/bindings/openssl/_conditional.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py
index adf00b02..670710b1 100644
--- a/src/cryptography/hazmat/bindings/openssl/_conditional.py
+++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py
@@ -410,5 +410,9 @@ CONDITIONAL_NAMES = {
],
"Cryptography_HAS_X509_V_FLAG_CHECK_SS_SIGNATURE": [
"X509_V_FLAG_CHECK_SS_SIGNATURE",
- ]
+ ],
+ "Cryptography_HAS_SET_CERT_CB": [
+ "SSL_CTX_set_cert_cb",
+ "SSL_set_cert_cb",
+ ],
}