From 479adf98d54a21c1d154aac59b2ce120e1d1a6d6 Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Sun, 20 Jun 2021 16:25:18 -0400 Subject: [PATCH] Remove old ASN.1 SET macros. These macros aren't consumed by anything anymore. Change-Id: Id9616fa0962ae0dbf27bc884c6883dcad9755eb2 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/48229 Commit-Queue: David Benjamin Reviewed-by: Adam Langley --- crypto/x509/x509_ext.c | 2 -- crypto/x509/x509_vfy.c | 4 ---- crypto/x509/x_algor.c | 2 -- crypto/x509/x_crl.c | 4 ---- crypto/x509/x_name.c | 2 -- crypto/x509v3/v3_crld.c | 2 -- include/openssl/asn1.h | 7 ------- include/openssl/x509.h | 7 ------- include/openssl/x509v3.h | 5 ----- 9 files changed, 35 deletions(-) diff --git a/crypto/x509/x509_ext.c b/crypto/x509/x509_ext.c index f6da54a4f..362c95b38 100644 --- a/crypto/x509/x509_ext.c +++ b/crypto/x509/x509_ext.c @@ -208,5 +208,3 @@ int X509_REVOKED_add1_ext_i2d(X509_REVOKED *x, int nid, void *value, int crit, { return X509V3_add1_i2d(&x->extensions, nid, value, crit, flags); } - -IMPLEMENT_ASN1_SET_OF(X509_EXTENSION) diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c index 2387de301..5ed4edd24 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -2493,7 +2493,3 @@ void X509_STORE_CTX_set0_param(X509_STORE_CTX *ctx, X509_VERIFY_PARAM *param) X509_VERIFY_PARAM_free(ctx->param); ctx->param = param; } - -IMPLEMENT_ASN1_SET_OF(X509) - -IMPLEMENT_ASN1_SET_OF(X509_ATTRIBUTE) diff --git a/crypto/x509/x_algor.c b/crypto/x509/x_algor.c index 0406628b4..a69149faa 100644 --- a/crypto/x509/x_algor.c +++ b/crypto/x509/x_algor.c @@ -77,8 +77,6 @@ IMPLEMENT_ASN1_FUNCTIONS(X509_ALGOR) IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(X509_ALGORS, X509_ALGORS, X509_ALGORS) IMPLEMENT_ASN1_DUP_FUNCTION(X509_ALGOR) -IMPLEMENT_ASN1_SET_OF(X509_ALGOR) - int X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype, void *pval) { if (!alg) diff --git a/crypto/x509/x_crl.c b/crypto/x509/x_crl.c index cf13d5dad..3f5fc1dff 100644 --- a/crypto/x509/x_crl.c +++ b/crypto/x509/x_crl.c @@ -561,7 +561,3 @@ void *X509_CRL_get_meth_data(X509_CRL *crl) { return crl->meth_data; } - -IMPLEMENT_ASN1_SET_OF(X509_REVOKED) - -IMPLEMENT_ASN1_SET_OF(X509_CRL) diff --git a/crypto/x509/x_name.c b/crypto/x509/x_name.c index bef9ec471..e4748a6d2 100644 --- a/crypto/x509/x_name.c +++ b/crypto/x509/x_name.c @@ -521,8 +521,6 @@ int X509_NAME_set(X509_NAME **xn, X509_NAME *name) return 1; } -IMPLEMENT_ASN1_SET_OF(X509_NAME_ENTRY) - int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne) { return ne->set; diff --git a/crypto/x509v3/v3_crld.c b/crypto/x509v3/v3_crld.c index c93c44955..27ccbc106 100644 --- a/crypto/x509v3/v3_crld.c +++ b/crypto/x509v3/v3_crld.c @@ -341,8 +341,6 @@ static void *v2i_crld(const X509V3_EXT_METHOD *method, return NULL; } -IMPLEMENT_ASN1_SET_OF(DIST_POINT) - static int dpn_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg) { diff --git a/include/openssl/asn1.h b/include/openssl/asn1.h index f0c5caa14..06eeab006 100644 --- a/include/openssl/asn1.h +++ b/include/openssl/asn1.h @@ -593,9 +593,6 @@ OPENSSL_EXPORT int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b); #define MBSTRING_BMP (MBSTRING_FLAG | 2) #define MBSTRING_UNIV (MBSTRING_FLAG | 4) -#define DECLARE_ASN1_SET_OF(type) // filled in by mkstack.pl -#define IMPLEMENT_ASN1_SET_OF(type) // nothing, no longer needed - // These are used internally in the ASN1_OBJECT to keep track of // whether the names and data need to be free()ed #define ASN1_OBJECT_FLAG_DYNAMIC 0x01 // internal use @@ -832,10 +829,8 @@ typedef const ASN1_ITEM ASN1_ITEM_EXP; ASN1_STRFLGS_DUMP_DER) DEFINE_STACK_OF(ASN1_INTEGER) -DECLARE_ASN1_SET_OF(ASN1_INTEGER) DEFINE_STACK_OF(ASN1_TYPE) -DECLARE_ASN1_SET_OF(ASN1_TYPE) typedef STACK_OF(ASN1_TYPE) ASN1_SEQUENCE_ANY; @@ -932,8 +927,6 @@ OPENSSL_EXPORT ASN1_OBJECT *d2i_ASN1_OBJECT(ASN1_OBJECT **a, DECLARE_ASN1_ITEM(ASN1_OBJECT) -DECLARE_ASN1_SET_OF(ASN1_OBJECT) - DECLARE_ASN1_FUNCTIONS(ASN1_BIT_STRING) OPENSSL_EXPORT int i2c_ASN1_BIT_STRING(const ASN1_BIT_STRING *a, unsigned char **pp); diff --git a/include/openssl/x509.h b/include/openssl/x509.h index 9901bfa7f..ac334625e 100644 --- a/include/openssl/x509.h +++ b/include/openssl/x509.h @@ -111,7 +111,6 @@ extern "C" { #define X509v3_KU_UNDEF 0xffff DEFINE_STACK_OF(X509_ALGOR) -DECLARE_ASN1_SET_OF(X509_ALGOR) typedef STACK_OF(X509_ALGOR) X509_ALGORS; @@ -123,7 +122,6 @@ struct X509_name_entry_st { } /* X509_NAME_ENTRY */; DEFINE_STACK_OF(X509_NAME_ENTRY) -DECLARE_ASN1_SET_OF(X509_NAME_ENTRY) // we always keep X509_NAMEs in 2 forms. struct X509_name_st { @@ -146,10 +144,8 @@ struct X509_extension_st { typedef STACK_OF(X509_EXTENSION) X509_EXTENSIONS; DEFINE_STACK_OF(X509_EXTENSION) -DECLARE_ASN1_SET_OF(X509_EXTENSION) DEFINE_STACK_OF(X509_ATTRIBUTE) -DECLARE_ASN1_SET_OF(X509_ATTRIBUTE) struct x509_cinf_st { ASN1_INTEGER *version; // [ 0 ] default of v1 @@ -199,7 +195,6 @@ struct x509_st { } /* X509 */; DEFINE_STACK_OF(X509) -DECLARE_ASN1_SET_OF(X509) // This is used for a table of trust checking functions @@ -321,7 +316,6 @@ struct x509_revoked_st { }; DEFINE_STACK_OF(X509_REVOKED) -DECLARE_ASN1_SET_OF(X509_REVOKED) struct X509_crl_info_st { ASN1_INTEGER *version; @@ -359,7 +353,6 @@ struct X509_crl_st { } /* X509_CRL */; DEFINE_STACK_OF(X509_CRL) -DECLARE_ASN1_SET_OF(X509_CRL) struct private_key_st { int version; diff --git a/include/openssl/x509v3.h b/include/openssl/x509v3.h index 003eb1268..7e65ab331 100644 --- a/include/openssl/x509v3.h +++ b/include/openssl/x509v3.h @@ -206,7 +206,6 @@ typedef struct GENERAL_NAME_st { } GENERAL_NAME; DEFINE_STACK_OF(GENERAL_NAME) -DECLARE_ASN1_SET_OF(GENERAL_NAME) typedef STACK_OF(GENERAL_NAME) GENERAL_NAMES; @@ -218,7 +217,6 @@ typedef struct ACCESS_DESCRIPTION_st { } ACCESS_DESCRIPTION; DEFINE_STACK_OF(ACCESS_DESCRIPTION) -DECLARE_ASN1_SET_OF(ACCESS_DESCRIPTION) typedef STACK_OF(ACCESS_DESCRIPTION) AUTHORITY_INFO_ACCESS; @@ -258,7 +256,6 @@ struct DIST_POINT_st { typedef STACK_OF(DIST_POINT) CRL_DIST_POINTS; DEFINE_STACK_OF(DIST_POINT) -DECLARE_ASN1_SET_OF(DIST_POINT) struct AUTHORITY_KEYID_st { ASN1_OCTET_STRING *keyid; @@ -286,7 +283,6 @@ typedef struct POLICYQUALINFO_st { } POLICYQUALINFO; DEFINE_STACK_OF(POLICYQUALINFO) -DECLARE_ASN1_SET_OF(POLICYQUALINFO) typedef struct POLICYINFO_st { ASN1_OBJECT *policyid; @@ -296,7 +292,6 @@ typedef struct POLICYINFO_st { typedef STACK_OF(POLICYINFO) CERTIFICATEPOLICIES; DEFINE_STACK_OF(POLICYINFO) -DECLARE_ASN1_SET_OF(POLICYINFO) typedef struct POLICY_MAPPING_st { ASN1_OBJECT *issuerDomainPolicy;