remove more unused bindings (#10426)

pyca · Feb 19, 2024 · 83c6010 · 83c6010
1 parent b19a286
commit 83c6010
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 48 deletions.
diff --git a/src/_cffi_src/openssl/asn1.py b/src/_cffi_src/openssl/asn1.py
@@ -22,15 +22,10 @@
 
 typedef struct asn1_string_st ASN1_OCTET_STRING;
 typedef struct asn1_string_st ASN1_IA5STRING;
-typedef struct asn1_string_st ASN1_BIT_STRING;
 typedef struct asn1_string_st ASN1_TIME;
 typedef ... ASN1_OBJECT;
 typedef struct asn1_string_st ASN1_STRING;
 typedef struct asn1_string_st ASN1_UTF8STRING;
-typedef struct {
-    int type;
-    ...;
-} ASN1_TYPE;
 typedef ... ASN1_GENERALIZEDTIME;
 typedef ... ASN1_ENUMERATED;
 

diff --git a/src/_cffi_src/openssl/ec.py b/src/_cffi_src/openssl/ec.py
@@ -25,8 +25,6 @@
 void EC_KEY_free(EC_KEY *);
 
 EC_KEY *EC_KEY_new_by_curve_name(int);
-
-const char *EC_curve_nid2nist(int);
 """
 
 CUSTOMIZATIONS = """

diff --git a/src/_cffi_src/openssl/err.py b/src/_cffi_src/openssl/err.py
@@ -9,17 +9,11 @@
 """
 
 TYPES = """
-static const int CIPHER_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH;
-
 static const int EVP_F_EVP_ENCRYPTFINAL_EX;
 static const int EVP_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH;
-static const int EVP_R_BAD_DECRYPT;
-static const int EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM;
-static const int PKCS12_R_PKCS12_CIPHERFINAL_ERROR;
 
 static const int ERR_LIB_EVP;
 static const int ERR_LIB_PROV;
-static const int ERR_LIB_PKCS12;
 
 static const int SSL_TLSEXT_ERR_OK;
 static const int SSL_TLSEXT_ERR_ALERT_FATAL;
@@ -50,14 +44,8 @@
 #endif
 
 #if CRYPTOGRAPHY_IS_BORINGSSL
-static const int ERR_LIB_PKCS12 = 0;
 static const int EVP_F_EVP_ENCRYPTFINAL_EX = 0;
-static const int EVP_R_BAD_DECRYPT = 0;
 static const int EVP_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH = 0;
-static const int EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM = 0;
-static const int PKCS12_R_PKCS12_CIPHERFINAL_ERROR = 0;
-#else
-static const int CIPHER_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH = 0;
 #endif
 
 /* SSL_R_UNEXPECTED_EOF_WHILE_READING is needed for pyOpenSSL

diff --git a/src/_cffi_src/openssl/nid.py b/src/_cffi_src/openssl/nid.py
@@ -17,8 +17,6 @@
 
 static const int NID_subject_alt_name;
 static const int NID_crl_reason;
-
-static const int NID_pkcs7_signed;
 """
 
 FUNCTIONS = """

diff --git a/src/_cffi_src/openssl/pkcs7.py b/src/_cffi_src/openssl/pkcs7.py
@@ -10,33 +10,7 @@
 
 TYPES = """
 static const long Cryptography_HAS_PKCS7_FUNCS;
-
-typedef struct {
-    Cryptography_STACK_OF_X509 *cert;
-    ...;
-} PKCS7_SIGNED;
-
-typedef ... PKCS7_SIGN_ENVELOPE;
-typedef ... PKCS7_DIGEST;
-typedef ... PKCS7_ENCRYPT;
-typedef ... PKCS7_ENVELOPE;
-typedef ... PKCS7_SIGNER_INFO;
-
-typedef struct {
-    ASN1_OBJECT *type;
-    union {
-        char *ptr;
-        ASN1_OCTET_STRING *data;
-        PKCS7_SIGNED *sign;
-        PKCS7_ENVELOPE *enveloped;
-        PKCS7_SIGN_ENVELOPE *signed_and_enveloped;
-        PKCS7_DIGEST *digest;
-        PKCS7_ENCRYPT *encrypted;
-        ASN1_TYPE *other;
-     } d;
-    ...;
-} PKCS7;
-
+typedef ... PKCS7;
 static const int PKCS7_TEXT;
 """