Revert "Add compatibility for X509_STORE_set_get_issuer"

This reverts commit 8020250.
pyca · Feb 21, 2021 · 3c1007d · 3c1007d
1 parent 8020250
commit 3c1007d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 16 deletions.
diff --git a/src/_cffi_src/openssl/x509_vfy.py b/src/_cffi_src/openssl/x509_vfy.py
@@ -21,7 +21,6 @@
 static const long Cryptography_HAS_102_VERIFICATION;
 static const long Cryptography_HAS_110_VERIFICATION_PARAMS;
 static const long Cryptography_HAS_X509_STORE_CTX_GET_ISSUER;
-static const long Cryptography_HAS_X509_CB_ISSUER_CHECK;
 
 typedef ... Cryptography_STACK_OF_ASN1_OBJECT;
 typedef ... Cryptography_STACK_OF_X509_OBJECT;
@@ -259,13 +258,6 @@
 static const long Cryptography_HAS_X509_STORE_CTX_GET_ISSUER = 1;
 #endif
 
-#ifndef X509_V_FLAG_CB_ISSUER_CHECK
-static const long Cryptography_HAS_X509_CB_ISSUER_CHECK = 0;
-#define X509_V_FLAG_CB_ISSUER_CHECK	0x0
-#else
-static const long Cryptography_HAS_X509_CB_ISSUER_CHECK = 1;
-#endif
-
 #if (OPENSSL_API_COMPAT >= 0x10100000L) && !CRYPTOGRAPHY_IS_LIBRESSL
 #define X509_STORE_CTX_trusted_stack X509_STORE_CTX_set0_trusted_stack
 #define X509_STORE_CTX_set_chain X509_STORE_CTX_set0_untrusted

diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py
@@ -301,11 +301,6 @@ def cryptography_has_get_proto_version():
         "SSL_get_max_proto_version",
     ]
 
-def cryptography_has_x509_cb_issuer_check():
-    return [
-        "X509_V_FLAG_CB_ISSUER_CHECK",
-    ]
-
 
 # This is a mapping of
 # {condition: function-returning-names-dependent-on-that-condition} so we can
@@ -359,7 +354,4 @@ def cryptography_has_x509_cb_issuer_check():
     "Cryptography_HAS_VERIFIED_CHAIN": cryptography_has_verified_chain,
     "Cryptography_HAS_SRTP": cryptography_has_srtp,
     "Cryptography_HAS_GET_PROTO_VERSION": cryptography_has_get_proto_version,
-    "Cryptography_HAS_X509_CB_ISSUER_CHECK": (
-        cryptography_has_x509_cb_issuer_check
-    ),
 }