From: Dr. Stephen Henson Date: Mon, 9 Feb 2015 12:03:48 +0000 (+0000) Subject: Remove obsolete IMPLEMENT_ASN1_SET_OF X-Git-Tag: OpenSSL_1_1_0-pre1~1673 X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=259c360d0b4faad28c89c97352291219903ee3c5 Remove obsolete IMPLEMENT_ASN1_SET_OF Reviewed-by: Andy Polyakov --- diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c index 6b6a5143c8..7f11859b64 100644 --- a/crypto/asn1/a_int.c +++ b/crypto/asn1/a_int.c @@ -454,5 +454,3 @@ BIGNUM *ASN1_INTEGER_to_BN(const ASN1_INTEGER *ai, BIGNUM *bn) BN_set_negative(ret, 1); return (ret); } - -IMPLEMENT_ASN1_SET_OF(ASN1_INTEGER) diff --git a/crypto/asn1/a_object.c b/crypto/asn1/a_object.c index 5732a71547..c780d8ee02 100644 --- a/crypto/asn1/a_object.c +++ b/crypto/asn1/a_object.c @@ -399,5 +399,3 @@ ASN1_OBJECT *ASN1_OBJECT_create(int nid, unsigned char *data, int len, ASN1_OBJECT_FLAG_DYNAMIC_DATA; return (OBJ_dup(&o)); } - -IMPLEMENT_ASN1_SET_OF(ASN1_OBJECT) diff --git a/crypto/asn1/a_type.c b/crypto/asn1/a_type.c index 94d0b1ab5f..13ecfcd9b9 100644 --- a/crypto/asn1/a_type.c +++ b/crypto/asn1/a_type.c @@ -103,8 +103,6 @@ int ASN1_TYPE_set1(ASN1_TYPE *a, int type, const void *value) return 1; } -IMPLEMENT_ASN1_SET_OF(ASN1_TYPE) - /* Returns 0 if they are equal, != 0 otherwise. */ int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b) { diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h index 104056eac3..5254c7d3c7 100644 --- a/crypto/asn1/asn1.h +++ b/crypto/asn1/asn1.h @@ -160,7 +160,6 @@ extern "C" { DECLARE_STACK_OF(X509_ALGOR) # define DECLARE_ASN1_SET_OF(type)/* filled in by mkstack.pl */ -# define IMPLEMENT_ASN1_SET_OF(type)/* nothing, no longer needed */ /* * We MUST make sure that, except for constness, asn1_ctx_st and diff --git a/crypto/asn1/x_algor.c b/crypto/asn1/x_algor.c index f7ff57387d..0aa3dedbae 100644 --- a/crypto/asn1/x_algor.c +++ b/crypto/asn1/x_algor.c @@ -74,7 +74,6 @@ ASN1_ITEM_TEMPLATE_END(X509_ALGORS) 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) { diff --git a/crypto/asn1/x_crl.c b/crypto/asn1/x_crl.c index bcbae1b32b..8884223875 100644 --- a/crypto/asn1/x_crl.c +++ b/crypto/asn1/x_crl.c @@ -505,7 +505,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/asn1/x_name.c b/crypto/asn1/x_name.c index bc446e0005..b915050ba3 100644 --- a/crypto/asn1/x_name.c +++ b/crypto/asn1/x_name.c @@ -521,5 +521,3 @@ int X509_NAME_set(X509_NAME **xn, X509_NAME *name) } return (*xn != NULL); } - -IMPLEMENT_ASN1_SET_OF(X509_NAME_ENTRY) diff --git a/crypto/x509/x509_ext.c b/crypto/x509/x509_ext.c index 1790b1b8c3..c5a3ad9929 100644 --- a/crypto/x509/x509_ext.c +++ b/crypto/x509/x509_ext.c @@ -205,5 +205,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 7e3bca76e7..cc9665ea65 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -2396,7 +2396,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/x509v3/v3_crld.c b/crypto/x509v3/v3_crld.c index 0dbed9f96b..9363541a98 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/crypto/x509v3/v3_sxnet.c b/crypto/x509v3/v3_sxnet.c index 6bff278d21..df1384abaf 100644 --- a/crypto/x509v3/v3_sxnet.c +++ b/crypto/x509v3/v3_sxnet.c @@ -267,5 +267,3 @@ ASN1_OCTET_STRING *SXNET_get_id_INTEGER(SXNET *sx, ASN1_INTEGER *zone) } return NULL; } - -IMPLEMENT_ASN1_SET_OF(SXNETID)