Remove obsolete IMPLEMENT_ASN1_SET_OF

Reviewed-by: Andy Polyakov <appro@openssl.org>

diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c
index 6b6a5143c8e4d9403c755710cf60dae8779b65bd..7f11859b6416ff51f4425b76452b8d4e167478e4 100644 (file)
--- 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 5732a71547c2eebf61eb52b250d911231cad00e0..c780d8ee0294a0724494b382d0d4a3fcbb1a167f 100644 (file)
--- 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 94d0b1ab5ff2cc591f05a3820423f43b490f8034..13ecfcd9b9b03a4a28185b829e42c91c3ab3da30 100644 (file)
--- 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 104056eac326ac7391798f78d669a54ec95c8f96..5254c7d3c7e0384a88fe5269d881f2e019679199 100644 (file)
--- 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 f7ff57387d533ac61d5faafca8a78d9cfc3f6bdb..0aa3dedbae51c86b6e9161b9f7ec9037eae3c1bc 100644 (file)
--- 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 bcbae1b32b13ae08c6e00aec43c0a1a309358e24..888422387581c6808e9425ec32238e9764dd6b6c 100644 (file)
--- 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 bc446e00055db74cb13452a8191d1e28a86a33a3..b915050ba3c4bdc1ce7284ce62a90f9b276e4d61 100644 (file)
--- 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 1790b1b8c3d4957e0d990b97104e0ab0af68a0e7..c5a3ad99298e077022bbc63ccacc0647788fe556 100644 (file)
--- 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 7e3bca76e75d93cbb871c4db85c7bc8eef6a94d6..cc9665ea6528bed327da72bb860671b5f19126b9 100644 (file)
--- 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 0dbed9f96b2212d0a20672fcc8fe303d6953e9c6..9363541a98fb44d6bee523fb82ac9ce6a50e114e 100644 (file)
--- 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 6bff278d215f7a366658b8eddb9b35e475837585..df1384abaf4ab20b0a1b03cdc7be1e706f6eb9e9 100644 (file)
--- 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)