Skip to content

Commit 479adf9

Browse files
davidbenBoringssl LUCI CQ
authored and
Boringssl LUCI CQ
committed
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 <[email protected]> Reviewed-by: Adam Langley <[email protected]>
1 parent b147c99 commit 479adf9

File tree

9 files changed

+0
-35
lines changed

9 files changed

+0
-35
lines changed

crypto/x509/x509_ext.c

-2
Original file line numberDiff line numberDiff line change
@@ -208,5 +208,3 @@ int X509_REVOKED_add1_ext_i2d(X509_REVOKED *x, int nid, void *value, int crit,
208208
{
209209
return X509V3_add1_i2d(&x->extensions, nid, value, crit, flags);
210210
}
211-
212-
IMPLEMENT_ASN1_SET_OF(X509_EXTENSION)

crypto/x509/x509_vfy.c

-4
Original file line numberDiff line numberDiff line change
@@ -2493,7 +2493,3 @@ void X509_STORE_CTX_set0_param(X509_STORE_CTX *ctx, X509_VERIFY_PARAM *param)
24932493
X509_VERIFY_PARAM_free(ctx->param);
24942494
ctx->param = param;
24952495
}
2496-
2497-
IMPLEMENT_ASN1_SET_OF(X509)
2498-
2499-
IMPLEMENT_ASN1_SET_OF(X509_ATTRIBUTE)

crypto/x509/x_algor.c

-2
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ IMPLEMENT_ASN1_FUNCTIONS(X509_ALGOR)
7777
IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(X509_ALGORS, X509_ALGORS, X509_ALGORS)
7878
IMPLEMENT_ASN1_DUP_FUNCTION(X509_ALGOR)
7979

80-
IMPLEMENT_ASN1_SET_OF(X509_ALGOR)
81-
8280
int X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype, void *pval)
8381
{
8482
if (!alg)

crypto/x509/x_crl.c

-4
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,3 @@ void *X509_CRL_get_meth_data(X509_CRL *crl)
561561
{
562562
return crl->meth_data;
563563
}
564-
565-
IMPLEMENT_ASN1_SET_OF(X509_REVOKED)
566-
567-
IMPLEMENT_ASN1_SET_OF(X509_CRL)

crypto/x509/x_name.c

-2
Original file line numberDiff line numberDiff line change
@@ -521,8 +521,6 @@ int X509_NAME_set(X509_NAME **xn, X509_NAME *name)
521521
return 1;
522522
}
523523

524-
IMPLEMENT_ASN1_SET_OF(X509_NAME_ENTRY)
525-
526524
int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne)
527525
{
528526
return ne->set;

crypto/x509v3/v3_crld.c

-2
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,6 @@ static void *v2i_crld(const X509V3_EXT_METHOD *method,
341341
return NULL;
342342
}
343343

344-
IMPLEMENT_ASN1_SET_OF(DIST_POINT)
345-
346344
static int dpn_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
347345
void *exarg)
348346
{

include/openssl/asn1.h

-7
Original file line numberDiff line numberDiff line change
@@ -593,9 +593,6 @@ OPENSSL_EXPORT int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b);
593593
#define MBSTRING_BMP (MBSTRING_FLAG | 2)
594594
#define MBSTRING_UNIV (MBSTRING_FLAG | 4)
595595

596-
#define DECLARE_ASN1_SET_OF(type) // filled in by mkstack.pl
597-
#define IMPLEMENT_ASN1_SET_OF(type) // nothing, no longer needed
598-
599596
// These are used internally in the ASN1_OBJECT to keep track of
600597
// whether the names and data need to be free()ed
601598
#define ASN1_OBJECT_FLAG_DYNAMIC 0x01 // internal use
@@ -832,10 +829,8 @@ typedef const ASN1_ITEM ASN1_ITEM_EXP;
832829
ASN1_STRFLGS_DUMP_DER)
833830

834831
DEFINE_STACK_OF(ASN1_INTEGER)
835-
DECLARE_ASN1_SET_OF(ASN1_INTEGER)
836832

837833
DEFINE_STACK_OF(ASN1_TYPE)
838-
DECLARE_ASN1_SET_OF(ASN1_TYPE)
839834

840835
typedef STACK_OF(ASN1_TYPE) ASN1_SEQUENCE_ANY;
841836

@@ -932,8 +927,6 @@ OPENSSL_EXPORT ASN1_OBJECT *d2i_ASN1_OBJECT(ASN1_OBJECT **a,
932927

933928
DECLARE_ASN1_ITEM(ASN1_OBJECT)
934929

935-
DECLARE_ASN1_SET_OF(ASN1_OBJECT)
936-
937930
DECLARE_ASN1_FUNCTIONS(ASN1_BIT_STRING)
938931
OPENSSL_EXPORT int i2c_ASN1_BIT_STRING(const ASN1_BIT_STRING *a,
939932
unsigned char **pp);

include/openssl/x509.h

-7
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ extern "C" {
111111
#define X509v3_KU_UNDEF 0xffff
112112

113113
DEFINE_STACK_OF(X509_ALGOR)
114-
DECLARE_ASN1_SET_OF(X509_ALGOR)
115114

116115
typedef STACK_OF(X509_ALGOR) X509_ALGORS;
117116

@@ -123,7 +122,6 @@ struct X509_name_entry_st {
123122
} /* X509_NAME_ENTRY */;
124123

125124
DEFINE_STACK_OF(X509_NAME_ENTRY)
126-
DECLARE_ASN1_SET_OF(X509_NAME_ENTRY)
127125

128126
// we always keep X509_NAMEs in 2 forms.
129127
struct X509_name_st {
@@ -146,10 +144,8 @@ struct X509_extension_st {
146144
typedef STACK_OF(X509_EXTENSION) X509_EXTENSIONS;
147145

148146
DEFINE_STACK_OF(X509_EXTENSION)
149-
DECLARE_ASN1_SET_OF(X509_EXTENSION)
150147

151148
DEFINE_STACK_OF(X509_ATTRIBUTE)
152-
DECLARE_ASN1_SET_OF(X509_ATTRIBUTE)
153149

154150
struct x509_cinf_st {
155151
ASN1_INTEGER *version; // [ 0 ] default of v1
@@ -199,7 +195,6 @@ struct x509_st {
199195
} /* X509 */;
200196

201197
DEFINE_STACK_OF(X509)
202-
DECLARE_ASN1_SET_OF(X509)
203198

204199
// This is used for a table of trust checking functions
205200

@@ -321,7 +316,6 @@ struct x509_revoked_st {
321316
};
322317

323318
DEFINE_STACK_OF(X509_REVOKED)
324-
DECLARE_ASN1_SET_OF(X509_REVOKED)
325319

326320
struct X509_crl_info_st {
327321
ASN1_INTEGER *version;
@@ -359,7 +353,6 @@ struct X509_crl_st {
359353
} /* X509_CRL */;
360354

361355
DEFINE_STACK_OF(X509_CRL)
362-
DECLARE_ASN1_SET_OF(X509_CRL)
363356

364357
struct private_key_st {
365358
int version;

include/openssl/x509v3.h

-5
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ typedef struct GENERAL_NAME_st {
206206
} GENERAL_NAME;
207207

208208
DEFINE_STACK_OF(GENERAL_NAME)
209-
DECLARE_ASN1_SET_OF(GENERAL_NAME)
210209

211210
typedef STACK_OF(GENERAL_NAME) GENERAL_NAMES;
212211

@@ -218,7 +217,6 @@ typedef struct ACCESS_DESCRIPTION_st {
218217
} ACCESS_DESCRIPTION;
219218

220219
DEFINE_STACK_OF(ACCESS_DESCRIPTION)
221-
DECLARE_ASN1_SET_OF(ACCESS_DESCRIPTION)
222220

223221
typedef STACK_OF(ACCESS_DESCRIPTION) AUTHORITY_INFO_ACCESS;
224222

@@ -258,7 +256,6 @@ struct DIST_POINT_st {
258256
typedef STACK_OF(DIST_POINT) CRL_DIST_POINTS;
259257

260258
DEFINE_STACK_OF(DIST_POINT)
261-
DECLARE_ASN1_SET_OF(DIST_POINT)
262259

263260
struct AUTHORITY_KEYID_st {
264261
ASN1_OCTET_STRING *keyid;
@@ -286,7 +283,6 @@ typedef struct POLICYQUALINFO_st {
286283
} POLICYQUALINFO;
287284

288285
DEFINE_STACK_OF(POLICYQUALINFO)
289-
DECLARE_ASN1_SET_OF(POLICYQUALINFO)
290286

291287
typedef struct POLICYINFO_st {
292288
ASN1_OBJECT *policyid;
@@ -296,7 +292,6 @@ typedef struct POLICYINFO_st {
296292
typedef STACK_OF(POLICYINFO) CERTIFICATEPOLICIES;
297293

298294
DEFINE_STACK_OF(POLICYINFO)
299-
DECLARE_ASN1_SET_OF(POLICYINFO)
300295

301296
typedef struct POLICY_MAPPING_st {
302297
ASN1_OBJECT *issuerDomainPolicy;

0 commit comments

Comments
 (0)