Merge branch 'main' into alex-patch-3

pyca · Jul 13, 2024 · e7d3249 · e7d3249
2 parents 5a106fe + db3dd51
commit e7d3249
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 60 deletions.
diff --git a/src/_cffi_src/build_openssl.py b/src/_cffi_src/build_openssl.py
@@ -35,7 +35,6 @@
         "objects",
         "opensslv",
         "pem",
-        "pkcs12",
         "rand",
         "rsa",
         "ssl",

diff --git a/src/_cffi_src/openssl/nid.py b/src/_cffi_src/openssl/nid.py
@@ -9,11 +9,7 @@
 """
 
 TYPES = """
-static const int Cryptography_HAS_ED448;
-
 static const int NID_undef;
-static const int NID_aes_256_cbc;
-static const int NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
 
 static const int NID_subject_alt_name;
 static const int NID_crl_reason;
@@ -23,9 +19,4 @@
 """
 
 CUSTOMIZATIONS = """
-#ifndef NID_ED448
-static const long Cryptography_HAS_ED448 = 0;
-#else
-static const long Cryptography_HAS_ED448 = 1;
-#endif
 """
diff --git a/src/_cffi_src/openssl/pkcs12.py b/src/_cffi_src/openssl/pkcs12.py
diff --git a/src/_cffi_src/openssl/x509.py b/src/_cffi_src/openssl/x509.py
@@ -15,26 +15,21 @@
  * Note that the result is an opaque type.
  */
 typedef STACK_OF(X509) Cryptography_STACK_OF_X509;
-typedef STACK_OF(X509_CRL) Cryptography_STACK_OF_X509_CRL;
 typedef STACK_OF(X509_REVOKED) Cryptography_STACK_OF_X509_REVOKED;
 """
 
 TYPES = """
 typedef ... Cryptography_STACK_OF_X509;
-typedef ... Cryptography_STACK_OF_X509_CRL;
 typedef ... Cryptography_STACK_OF_X509_REVOKED;
 
 typedef ... X509_ALGOR;
-typedef ... X509_ATTRIBUTE;
 typedef ... X509_EXTENSION;
 typedef ... X509_EXTENSIONS;
 typedef ... X509_REQ;
 typedef ... X509_REVOKED;
 typedef ... X509_CRL;
 typedef ... X509;
 
-typedef ... PKCS8_PRIV_KEY_INFO;
-
 typedef void (*sk_X509_EXTENSION_freefunc)(X509_EXTENSION *);
 """
 

diff --git a/src/_cffi_src/openssl/x509_vfy.py b/src/_cffi_src/openssl/x509_vfy.py
@@ -14,12 +14,10 @@
  * together with another opaque typedef for the same name in the TYPES section.
  * Note that the result is an opaque type.
  */
-typedef STACK_OF(ASN1_OBJECT) Cryptography_STACK_OF_ASN1_OBJECT;
 typedef STACK_OF(X509_OBJECT) Cryptography_STACK_OF_X509_OBJECT;
 """
 
 TYPES = """
-typedef ... Cryptography_STACK_OF_ASN1_OBJECT;
 typedef ... Cryptography_STACK_OF_X509_OBJECT;
 
 typedef ... X509_OBJECT;

diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py
@@ -147,10 +147,6 @@ def cryptography_has_unexpected_eof_while_reading() -> list[str]:
     return ["SSL_R_UNEXPECTED_EOF_WHILE_READING"]
 
 
-def cryptography_has_pkcs12_set_mac() -> list[str]:
-    return ["PKCS12_set_mac"]
-
-
 def cryptography_has_ssl_op_ignore_unexpected_eof() -> list[str]:
     return [
         "SSL_OP_IGNORE_UNEXPECTED_EOF",
@@ -188,7 +184,6 @@ def cryptography_has_get_extms_support() -> list[str]:
     "Cryptography_HAS_UNEXPECTED_EOF_WHILE_READING": (
         cryptography_has_unexpected_eof_while_reading
     ),
-    "Cryptography_HAS_PKCS12_SET_MAC": cryptography_has_pkcs12_set_mac,
     "Cryptography_HAS_SSL_OP_IGNORE_UNEXPECTED_EOF": (
         cryptography_has_ssl_op_ignore_unexpected_eof
     ),