Fix safestack issues in x509.h

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12781)

diff --git a/.gitignore b/.gitignore
index 498d3aeffa16f6cd2eeb6aadb5382d7d06c912aa..1996b07fa15a25d3327e1f058171dc697793b168 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@
 /include/openssl/opensslv.h
 /include/openssl/fipskey.h
 /include/openssl/ssl.h
+/include/openssl/x509.h
 
 # Auto generated doc files
 doc/man1/openssl-*.pod

diff --git a/apps/ca.c b/apps/ca.c
index 3c2bee8f2fdc63cc3076e245ff5e6ea17be691ba..cb1c90991c19be5a26c47d0c72ad0520d0ae34c4 100644 (file)
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -34,8 +34,6 @@
 #include "apps.h"
 #include "progs.h"
 
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_EXTENSION)
 DEFINE_STACK_OF(CONF_VALUE)
 DEFINE_STACK_OF_STRING()
 

diff --git a/apps/cmp.c b/apps/cmp.c
index db0d418bd474afc66a8a820a43e8a286cd9e9b34..4d77b541c417b32f67bf57700054bf5eaced11cc 100644 (file)
--- a/apps/cmp.c
+++ b/apps/cmp.c
@@ -42,8 +42,6 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_EXTENSION)
 DEFINE_STACK_OF(OSSL_CMP_ITAV)
 
 static char *opt_config = NULL;

diff --git a/apps/cmp_mock_srv.c b/apps/cmp_mock_srv.c
index 3a0819008bfc3204a7c5fd88dec2f1e5e31f1614..2c825678565336c07ed45cf2bd3a4f6913fdc2ba 100644 (file)
--- a/apps/cmp_mock_srv.c
+++ b/apps/cmp_mock_srv.c
@@ -15,7 +15,6 @@
 #include <openssl/err.h>
 #include <openssl/cmperr.h>
 
-DEFINE_STACK_OF(X509)
 DEFINE_STACK_OF(OSSL_CMP_ITAV)
 DEFINE_STACK_OF(ASN1_UTF8STRING)
  

diff --git a/apps/cms.c b/apps/cms.c
index d154f460b37d2c09d039f10b8d030f808e3a2d19..fada7b57a9478659e1701fc2da4851dc989222e0 100644 (file)
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -23,7 +23,6 @@
 # include <openssl/x509v3.h>
 # include <openssl/cms.h>
 
-DEFINE_STACK_OF(X509)
 DEFINE_STACK_OF(CMS_SignerInfo)
 DEFINE_STACK_OF(GENERAL_NAME)
 DEFINE_STACK_OF(GENERAL_NAMES)

diff --git a/apps/crl2p7.c b/apps/crl2p7.c
index e0de95a12a72f333bb3b9b5cae5ea2bb34068af5..545fe0a53b8d883445c5493ade07671040873889 100644 (file)
--- a/apps/crl2p7.c
+++ b/apps/crl2p7.c
@@ -19,9 +19,6 @@
 #include <openssl/pem.h>
 #include <openssl/objects.h>
 
-DEFINE_STACK_OF(X509_CRL)
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_INFO)
 DEFINE_STACK_OF_STRING()
 
 static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile);

diff --git a/apps/lib/apps.c b/apps/lib/apps.c
index 5d95ce0c652223138800d807df93b8a2ce3acde0..bd6a6bc54b27b449f1a967c14ecc5d6a0d267584 100644 (file)
--- a/apps/lib/apps.c
+++ b/apps/lib/apps.c
@@ -63,10 +63,6 @@ static int WIN32_rename(const char *from, const char *to);
 
 DEFINE_STACK_OF(CONF)
 DEFINE_STACK_OF(CONF_VALUE)
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_CRL)
-DEFINE_STACK_OF(X509_INFO)
-DEFINE_STACK_OF(X509_EXTENSION)
 DEFINE_STACK_OF(X509_POLICY_NODE)
 DEFINE_STACK_OF(GENERAL_NAME)
 DEFINE_STACK_OF(DIST_POINT)

diff --git a/apps/lib/s_cb.c b/apps/lib/s_cb.c
index 0ae851d7925be457e63cae50ed2e69a97c0c178f..b53d4cbd408e810ea772aa3344dc07b9089a6114 100644 (file)
--- a/apps/lib/s_cb.c
+++ b/apps/lib/s_cb.c
@@ -26,9 +26,6 @@
 
 #define COOKIE_SECRET_LENGTH    16
 
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_CRL)
-DEFINE_STACK_OF(X509_NAME)
 DEFINE_STACK_OF_STRING()
 
 VERIFY_CB_ARGS verify_args = { -1, 0, X509_V_OK, 0 };

diff --git a/apps/nseq.c b/apps/nseq.c
index de189632b24abb6bf9173aa0d8cc0c27766f69d7..92ae7bd34dac2b49a56c639ef54130f7a8600ad1 100644 (file)
--- a/apps/nseq.c
+++ b/apps/nseq.c
@@ -14,8 +14,6 @@
 #include <openssl/pem.h>
 #include <openssl/err.h>
 
-DEFINE_STACK_OF(X509)
-
 typedef enum OPTION_choice {
     OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
     OPT_TOSEQ, OPT_IN, OPT_OUT,

diff --git a/apps/ocsp.c b/apps/ocsp.c
index 4f42d66c0ed1a2c2894cbfd6ffd7ad11689ede7e..ad699629f62eff2b0f9f16a6d23954dc31d34063 100644 (file)
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -35,7 +35,6 @@
 
 DEFINE_STACK_OF(OCSP_CERTID)
 DEFINE_STACK_OF(CONF_VALUE)
-DEFINE_STACK_OF(X509)
 DEFINE_STACK_OF_STRING()
 
 #if defined(__TANDEM)

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 23ffa98f77301aeb5d9b07debe11e50c6b16c6ea..fddfdbca3699f96090332c0feb272d8698e1f005 100644 (file)
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -20,10 +20,8 @@
 #include <openssl/pkcs12.h>
 #include <openssl/provider.h>
 
-DEFINE_STACK_OF(X509)
 DEFINE_STACK_OF(PKCS7)
 DEFINE_STACK_OF(PKCS12_SAFEBAG)
-DEFINE_STACK_OF(X509_ATTRIBUTE)
 DEFINE_STACK_OF_STRING()
 
 #define NOKEYS          0x1

diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index 95d3ca08459383732389850f2e4034ed429f803f..e6ac26e6f91408842e5772bf883d9b91837766b1 100644 (file)
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -20,9 +20,6 @@
 #include <openssl/pkcs7.h>
 #include <openssl/pem.h>
 
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_CRL)
-
 typedef enum OPTION_choice {
     OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
     OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT, OPT_NOOUT,

diff --git a/apps/rehash.c b/apps/rehash.c
index 866b8cfe206d5ba501a075bd3f6e67d03b01b764..efa0b654972f6299425b03989d1541bbbb94d56f 100644 (file)
--- a/apps/rehash.c
+++ b/apps/rehash.c
@@ -42,7 +42,6 @@
 # include <openssl/pem.h>
 # include <openssl/x509.h>
 
-DEFINE_STACK_OF(X509_INFO)
 DEFINE_STACK_OF_STRING()
 
 # ifndef PATH_MAX

diff --git a/apps/s_client.c b/apps/s_client.c
index 2a58589ce29ae4071317b2b81b186e76eba35f5c..32aa6fafcbd42b4d283d81acafd7c1ea92387e8d 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -59,9 +59,6 @@ typedef unsigned int u_int;
 # endif
 #endif
 
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_CRL)
-DEFINE_STACK_OF(X509_NAME)
 DEFINE_STACK_OF(SCT)
 DEFINE_STACK_OF_STRING()
 

diff --git a/apps/s_server.c b/apps/s_server.c
index f1ea550fed85d0279ff0e1eaef0499d2b00109dd..c970080d83170a02221584285f5e540faad3f032 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -60,9 +60,6 @@ typedef unsigned int u_int;
 #endif
 #include "internal/sockets.h"
 
-DEFINE_STACK_OF(X509_EXTENSION)
-DEFINE_STACK_OF(X509_CRL)
-DEFINE_STACK_OF(X509)
 DEFINE_STACK_OF_STRING()
 
 static int not_resumable_sess_cb(SSL *s, int is_forward_secure);

diff --git a/apps/smime.c b/apps/smime.c
index dbfcdbeb5a9f185215be87db281ed067913fd986..ed3d63af6ca123712dcec35765dd61b48d7d4c03 100644 (file)
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -19,7 +19,6 @@
 #include <openssl/x509_vfy.h>
 #include <openssl/x509v3.h>
 
-DEFINE_STACK_OF(X509)
 DEFINE_STACK_OF_STRING()
 
 static int save_certs(char *signerfile, STACK_OF(X509) *signers);

diff --git a/apps/verify.c b/apps/verify.c
index ed20b69b17495ad34d8b11daa2e74180cd01f102..c43a4e69a47a2fbbda6749b014eecb3920e9f3c7 100644 (file)
--- a/apps/verify.c
+++ b/apps/verify.c
@@ -18,8 +18,6 @@
 #include <openssl/x509v3.h>
 #include <openssl/pem.h>
 
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_CRL)
 DEFINE_STACK_OF_STRING()
 
 static int cb(int ok, X509_STORE_CTX *ctx);

diff --git a/apps/x509.c b/apps/x509.c
index 169530f6d66f30f3b11e55b81f3b6a51830121b0..4b2200c35b6efc191238f442b3814a09e5b9c0f0 100644 (file)
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -29,7 +29,6 @@
 #endif
 
 DEFINE_STACK_OF(ASN1_OBJECT)
-DEFINE_STACK_OF(X509_EXTENSION)
 DEFINE_STACK_OF_STRING()
 
 #undef POSTFIX

diff --git a/build.info b/build.info
index c1933bf73c30708e4f98247318b0d865723d2717..02a36cd4358b822d5346629484e46b3a2fd293c7 100644 (file)
--- a/build.info
+++ b/build.info
@@ -16,6 +16,7 @@ DEPEND[libssl]=libcrypto
 DEPEND[]=include/openssl/configuration.h include/openssl/opensslv.h \
          include/openssl/fipskey.h \
          include/openssl/ssl.h \
+         include/openssl/x509.h \
          include/crypto/bn_conf.h include/crypto/dso_conf.h \
          doc/man7/openssl_user_macros.pod
 
@@ -23,6 +24,7 @@ GENERATE[include/openssl/configuration.h]=include/openssl/configuration.h.in
 GENERATE[include/openssl/opensslv.h]=include/openssl/opensslv.h.in
 GENERATE[include/openssl/fipskey.h]=include/openssl/fipskey.h.in
 GENERATE[include/openssl/ssl.h]=include/openssl/ssl.h.in
+GENERATE[include/openssl/x509.h]=include/openssl/x509.h.in
 GENERATE[include/crypto/bn_conf.h]=include/crypto/bn_conf.h.in
 GENERATE[include/crypto/dso_conf.h]=include/crypto/dso_conf.h.in
 GENERATE[doc/man7/openssl_user_macros.pod]=doc/man7/openssl_user_macros.pod.in

diff --git a/crypto/cmp/cmp_client.c b/crypto/cmp/cmp_client.c
index fe7168916aba8b644f18d9ae80185cf583eb189b..567eb45519bfdce143538af1c464a1cef6d87a81 100644 (file)
--- a/crypto/cmp/cmp_client.c
+++ b/crypto/cmp/cmp_client.c
@@ -22,8 +22,6 @@
 #include "openssl/cmp_util.h"
 
 DEFINE_STACK_OF(ASN1_UTF8STRING)
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_CRL)
 DEFINE_STACK_OF(OSSL_CMP_CERTRESPONSE)
 DEFINE_STACK_OF(OSSL_CMP_PKISI)
 DEFINE_STACK_OF(OSSL_CRMF_CERTID)

diff --git a/crypto/cmp/cmp_ctx.c b/crypto/cmp/cmp_ctx.c
index 6bbd3510c7d1ca4a0eb25015a079f3e805dd407f..f324763bf1757508c842e685ddb55faa6198c978 100644 (file)
--- a/crypto/cmp/cmp_ctx.c
+++ b/crypto/cmp/cmp_ctx.c
@@ -21,8 +21,6 @@
 #include <openssl/crmf.h>
 #include <openssl/err.h>
 
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_EXTENSION)
 DEFINE_STACK_OF(POLICYINFO)
 DEFINE_STACK_OF(ASN1_UTF8STRING)
 DEFINE_STACK_OF(GENERAL_NAME)

diff --git a/crypto/cmp/cmp_msg.c b/crypto/cmp/cmp_msg.c
index 64e00fc884b334c88bfa99bf23a39757affa72db..11f43ab58818c630bb3d91a93d94c37d78e696fd 100644 (file)
--- a/crypto/cmp/cmp_msg.c
+++ b/crypto/cmp/cmp_msg.c
@@ -24,8 +24,6 @@
 DEFINE_STACK_OF(OSSL_CMP_CERTSTATUS)
 DEFINE_STACK_OF(OSSL_CMP_ITAV)
 DEFINE_STACK_OF(GENERAL_NAME)
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_EXTENSION)
 DEFINE_STACK_OF(OSSL_CMP_PKISI)
 DEFINE_STACK_OF(OSSL_CRMF_MSG)
 DEFINE_STACK_OF(OSSL_CMP_CERTRESPONSE)

diff --git a/crypto/cmp/cmp_protect.c b/crypto/cmp/cmp_protect.c
index a6a0f9f9e0e127213d53e0ece90b41fe2f5493de..eb162e382da8a3fe2dec7fa1b77644c551bfbac1 100644 (file)
--- a/crypto/cmp/cmp_protect.c
+++ b/crypto/cmp/cmp_protect.c
@@ -18,8 +18,6 @@
 #include <openssl/err.h>
 #include <openssl/x509.h>
 
-DEFINE_STACK_OF(X509)
-
 /*
  * This function is also used by the internal verify_PBMAC() in cmp_vfy.c.
  *

diff --git a/crypto/cmp/cmp_server.c b/crypto/cmp/cmp_server.c
index 2ba6cb79843c7bf7880a876056f9495e63567655..3c247336fccb47180acc6a206ac53400369958e3 100644 (file)
--- a/crypto/cmp/cmp_server.c
+++ b/crypto/cmp/cmp_server.c
@@ -20,7 +20,6 @@
 #include <openssl/err.h>
 
 DEFINE_STACK_OF(OSSL_CRMF_MSG)
-DEFINE_STACK_OF(X509)
 DEFINE_STACK_OF(OSSL_CMP_ITAV)
 DEFINE_STACK_OF(OSSL_CMP_CERTSTATUS)
 

diff --git a/crypto/cmp/cmp_util.c b/crypto/cmp/cmp_util.c
index c2ee9b6e0d31093e8dabb9c14efee6b408528861..ec292ee35289e6169ed893e074a367e094b18c12 100644 (file)
--- a/crypto/cmp/cmp_util.c
+++ b/crypto/cmp/cmp_util.c
@@ -16,7 +16,6 @@
 #include <openssl/err.h> /* should be implied by cmperr.h */
 #include <openssl/x509v3.h>
 
-DEFINE_STACK_OF(X509)
 DEFINE_STACK_OF(X509_OBJECT)
 DEFINE_STACK_OF(ASN1_UTF8STRING)
 

diff --git a/crypto/cmp/cmp_vfy.c b/crypto/cmp/cmp_vfy.c
index f5026e0bbc422d4e1fe9f0029b2250a734efce37..00757c11ae96cd40619a40420c388a262097bf2f 100644 (file)
--- a/crypto/cmp/cmp_vfy.c
+++ b/crypto/cmp/cmp_vfy.c
@@ -22,8 +22,6 @@
 #include <openssl/x509.h>
 #include "crypto/x509.h"
 
-DEFINE_STACK_OF(X509)
-
 /* Verify a message protected by signature according to RFC section 5.1.3.3 */
 static int verify_signature(const OSSL_CMP_CTX *cmp_ctx,
                             const OSSL_CMP_MSG *msg, X509 *cert)

diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c
index 944846ca98c78af33538c7ff3d7bea98b4689143..f0c895704f4527e1b565bffea8740d30aa43ca5d 100644 (file)
--- a/crypto/cms/cms_env.c
+++ b/crypto/cms/cms_env.c
@@ -21,7 +21,6 @@
 
 DEFINE_STACK_OF(CMS_RecipientInfo)
 DEFINE_STACK_OF(CMS_RevocationInfoChoice)
-DEFINE_STACK_OF(X509_ATTRIBUTE)
 
 /* CMS EnvelopedData Utilities */
 static void cms_env_set_version(CMS_EnvelopedData *env);

diff --git a/crypto/cms/cms_ess.c b/crypto/cms/cms_ess.c
index b6b2037532b31f78453da77e62cce0b5061d6107..6fc0ca27d9f8d0df578902e9e872622a504083e0 100644 (file)
--- a/crypto/cms/cms_ess.c
+++ b/crypto/cms/cms_ess.c
@@ -24,7 +24,6 @@ DEFINE_STACK_OF(GENERAL_NAMES)
 DEFINE_STACK_OF(CMS_SignerInfo)
 DEFINE_STACK_OF(ESS_CERT_ID)
 DEFINE_STACK_OF(ESS_CERT_ID_V2)
-DEFINE_STACK_OF(X509)
 
 IMPLEMENT_ASN1_FUNCTIONS(CMS_ReceiptRequest)
 

diff --git a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c
index 9fc8453d9925d9fab667d53b894580ad7ea5c529..0b9a3f2b2f27c925bbddd93e94362e5ac6651d32 100644 (file)
--- a/crypto/cms/cms_lib.c
+++ b/crypto/cms/cms_lib.c
@@ -22,8 +22,6 @@ static STACK_OF(CMS_CertificateChoices)
 **cms_get0_certificate_choices(CMS_ContentInfo *cms);
 
 DEFINE_STACK_OF(CMS_RevocationInfoChoice)
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_CRL)
 
 IMPLEMENT_ASN1_PRINT_FUNCTION(CMS_ContentInfo)
 

diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c
index c11d44487bb014b86c9a76afb76802b24e43a7ac..ac07ddefe9f34a026e34b3ee6fc628583c988203 100644 (file)
--- a/crypto/cms/cms_sd.c
+++ b/crypto/cms/cms_sd.c
@@ -24,9 +24,7 @@
 
 DEFINE_STACK_OF(CMS_RevocationInfoChoice)
 DEFINE_STACK_OF(CMS_SignerInfo)
-DEFINE_STACK_OF(X509)
 DEFINE_STACK_OF(X509_ALGOR)
-DEFINE_STACK_OF(X509_ATTRIBUTE)
 
 /* CMS SignedData Utilities */
 

diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c
index 92de68aa57216ed1b23ffba65febc5a9e5bf5e36..b2287c624d4cad60e06d514c0262f18607608bb2 100644 (file)
--- a/crypto/cms/cms_smime.c
+++ b/crypto/cms/cms_smime.c
@@ -17,8 +17,6 @@
 #include "crypto/asn1.h"
 
 DEFINE_STACK_OF(CMS_SignerInfo)
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_CRL)
 DEFINE_STACK_OF(CMS_RecipientEncryptedKey)
 DEFINE_STACK_OF(CMS_RecipientInfo)
 

diff --git a/crypto/crmf/crmf_lib.c b/crypto/crmf/crmf_lib.c
index 3202f357c1a8f8d607483846bc1838ed1da2b092..5c3acaf4b25754836c40fd663b3124cfe2831199 100644 (file)
--- a/crypto/crmf/crmf_lib.c
+++ b/crypto/crmf/crmf_lib.c
@@ -36,7 +36,6 @@
 #include <openssl/err.h>
 #include <openssl/evp.h>
 
-DEFINE_STACK_OF(X509_EXTENSION)
 DEFINE_STACK_OF(OSSL_CRMF_MSG)
 
 /*-

diff --git a/crypto/ess/ess_lib.c b/crypto/ess/ess_lib.c
index ad0d6f332cec3db5a06836ec2678a9eef03f3ab5..92073b959848be3664db0c1e6a41854eb24a020b 100644 (file)
--- a/crypto/ess/ess_lib.c
+++ b/crypto/ess/ess_lib.c
@@ -17,7 +17,6 @@
 DEFINE_STACK_OF(ESS_CERT_ID)
 DEFINE_STACK_OF(ESS_CERT_ID_V2)
 DEFINE_STACK_OF(GENERAL_NAME)
-DEFINE_STACK_OF(X509)
 
 static ESS_CERT_ID *ESS_CERT_ID_new_init(X509 *cert, int issuer_needed);
 static ESS_CERT_ID_V2 *ESS_CERT_ID_V2_new_init(const EVP_MD *hash_alg,

diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index cb72048f8649c808b154d0d076f17efd09b00165..8fe702787d11b64d61b0d1f2989c1882092842ce 100644 (file)
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -38,7 +38,6 @@
 #include "internal/evp.h"
 #include "internal/provider.h"
 #include "evp_local.h"
-DEFINE_STACK_OF(X509_ATTRIBUTE)
 
 #include "crypto/ec.h"
 

diff --git a/crypto/ocsp/ocsp_cl.c b/crypto/ocsp/ocsp_cl.c
index f45bf1d6dc7157b556cddad3f86a0e4789a16ada..b977e88d038c87b3d096cff42841f6449ae423f0 100644 (file)
--- a/crypto/ocsp/ocsp_cl.c
+++ b/crypto/ocsp/ocsp_cl.c
@@ -18,7 +18,6 @@
 #include <openssl/ocsp.h>
 #include "ocsp_local.h"
 
-DEFINE_STACK_OF(X509)
 DEFINE_STACK_OF(OCSP_ONEREQ)
 DEFINE_STACK_OF(OCSP_SINGLERESP)
 

diff --git a/crypto/ocsp/ocsp_prn.c b/crypto/ocsp/ocsp_prn.c
index c782a8e53160ba48a44eeffcee67f6279bf0e9c4..c4917ee18460bf2a3b8686505efcc22d6ca02287 100644 (file)
--- a/crypto/ocsp/ocsp_prn.c
+++ b/crypto/ocsp/ocsp_prn.c
@@ -15,7 +15,6 @@
 #include <openssl/pem.h>
 
 DEFINE_STACK_OF(OCSP_ONEREQ)
-DEFINE_STACK_OF(X509)
 DEFINE_STACK_OF(OCSP_SINGLERESP)
 
 static int ocsp_certid_print(BIO *bp, OCSP_CERTID *a, int indent)

diff --git a/crypto/ocsp/ocsp_srv.c b/crypto/ocsp/ocsp_srv.c
index d20a71485531c57fd9380073bbf44a870c4c9f08..a87fea892d59ad914fb09b1789f60906f0b5d7dd 100644 (file)
--- a/crypto/ocsp/ocsp_srv.c
+++ b/crypto/ocsp/ocsp_srv.c
@@ -17,7 +17,6 @@
 #include "ocsp_local.h"
 
 DEFINE_STACK_OF(OCSP_ONEREQ)
-DEFINE_STACK_OF(X509)
 DEFINE_STACK_OF(OCSP_SINGLERESP)
 
 /*

diff --git a/crypto/ocsp/ocsp_vfy.c b/crypto/ocsp/ocsp_vfy.c
index cf7602616f3d7081c950e9347ca0de09e4b1a078..35a01c444dfdcf5fd74cc7866a036cc30e8ec0e8 100644 (file)
--- a/crypto/ocsp/ocsp_vfy.c
+++ b/crypto/ocsp/ocsp_vfy.c
@@ -13,7 +13,6 @@
 #include <string.h>
 
 DEFINE_STACK_OF(OCSP_ONEREQ)
-DEFINE_STACK_OF(X509)
 DEFINE_STACK_OF(OCSP_SINGLERESP)
 
 static int ocsp_find_signer(X509 **psigner, OCSP_BASICRESP *bs,

diff --git a/crypto/pem/pem_info.c b/crypto/pem/pem_info.c
index a3981c9dda5212f3de0f4be98b09df949f2b7f89..ef023205c033a847d5b4422004071423fd48b78b 100644 (file)
--- a/crypto/pem/pem_info.c
+++ b/crypto/pem/pem_info.c
@@ -23,8 +23,6 @@
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
 
-DEFINE_STACK_OF(X509_INFO)
-
 #ifndef OPENSSL_NO_STDIO
 STACK_OF(X509_INFO)
 *PEM_X509_INFO_read_with_libctx(FILE *fp, STACK_OF(X509_INFO) *sk,

diff --git a/crypto/pkcs12/p12_crt.c b/crypto/pkcs12/p12_crt.c
index 699f1b7d617537a735b64f8330fa2868efbdbd3f..757b6ae63148d5b447585eade798b7840ce864d1 100644 (file)
--- a/crypto/pkcs12/p12_crt.c
+++ b/crypto/pkcs12/p12_crt.c
@@ -12,7 +12,6 @@
 #include <openssl/pkcs12.h>
 #include "p12_local.h"
 
-DEFINE_STACK_OF(X509)
 DEFINE_STACK_OF(PKCS7)
 DEFINE_STACK_OF(PKCS12_SAFEBAG)
 

diff --git a/crypto/pkcs12/p12_kiss.c b/crypto/pkcs12/p12_kiss.c
index 5413aecb1c82c72bfbc6b8a42ec670315bfeb483..433bccdb30fb6b8e685f3c97af6f331e2902ee41 100644 (file)
--- a/crypto/pkcs12/p12_kiss.c
+++ b/crypto/pkcs12/p12_kiss.c
@@ -12,7 +12,6 @@
 #include <openssl/pkcs12.h>
 #include "crypto/x509.h" /* for X509_add_cert_new() */
 
-DEFINE_STACK_OF(X509)
 DEFINE_STACK_OF(PKCS7)
 DEFINE_STACK_OF(PKCS12_SAFEBAG)
 

diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
index c48c629398e3744b62c6f0ce9a6cdec94587f892..faefa9e95b551bf3fe1266ef9c493c4a03ca8f03 100644 (file)
--- a/crypto/pkcs7/pk7_doit.c
+++ b/crypto/pkcs7/pk7_doit.c
@@ -17,7 +17,6 @@
 #include "pk7_local.h"
 
 DEFINE_STACK_OF(X509_ALGOR)
-DEFINE_STACK_OF(X509_ATTRIBUTE)
 DEFINE_STACK_OF(PKCS7_RECIP_INFO)
 DEFINE_STACK_OF(PKCS7_SIGNER_INFO)
 

diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c
index d891ca22e8db608a65065f7e3229a1991dd0e6c6..59e23a445f6af20ad4b190ae2036b3d635ffa5b8 100644 (file)
--- a/crypto/pkcs7/pk7_lib.c
+++ b/crypto/pkcs7/pk7_lib.c
@@ -16,8 +16,6 @@
 #include "crypto/x509.h" /* for sk_X509_add1_cert() */
 #include "pk7_local.h"
 
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_CRL)
 DEFINE_STACK_OF(X509_ALGOR)
 DEFINE_STACK_OF(PKCS7_RECIP_INFO)
 DEFINE_STACK_OF(PKCS7_SIGNER_INFO)

diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c
index 1dfdd69e512056f3eb217e201dd71c273618e069..2bd495a717a1b5b979b49a1909b67c9ec888bf52 100644 (file)
--- a/crypto/pkcs7/pk7_smime.c
+++ b/crypto/pkcs7/pk7_smime.c
@@ -17,8 +17,6 @@
 
 #define BUFFERSIZE 4096
 
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_ATTRIBUTE)
 DEFINE_STACK_OF(X509_ALGOR)
 DEFINE_STACK_OF(PKCS7_SIGNER_INFO)
 

diff --git a/crypto/store/store_result.c b/crypto/store/store_result.c
index 47dd21acb97193a6781a09f8f4266b13934b5fc6..0c78e94ec4fb200f33f6a8fa817133b3d403fde8 100644 (file)
--- a/crypto/store/store_result.c
+++ b/crypto/store/store_result.c
@@ -59,8 +59,6 @@
  * reference.
  */
 
-DEFINE_STACK_OF(X509)
-
 struct extracted_param_data_st {
     int object_type;
     const char *data_type;

diff --git a/crypto/ts/ts_conf.c b/crypto/ts/ts_conf.c
index 71664fa0919874cbd4724b5d0d22a309381f7a36..9d4011519efbfafe6ee9542729a436d6059c2f54 100644 (file)
--- a/crypto/ts/ts_conf.c
+++ b/crypto/ts/ts_conf.c
@@ -18,8 +18,6 @@
 #include <openssl/engine.h>
 #include <openssl/ts.h>
 
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_INFO)
 DEFINE_STACK_OF(CONF_VALUE)
 
 /* Macro definitions for the configuration file. */

diff --git a/crypto/ts/ts_req_utils.c b/crypto/ts/ts_req_utils.c
index 2d14ed1145448dcb8b71abf8106a852e852a3d45..e4b3eee48feb2c87495e22a4717dfedf9968c3c7 100644 (file)
--- a/crypto/ts/ts_req_utils.c
+++ b/crypto/ts/ts_req_utils.c
@@ -14,8 +14,6 @@
 #include <openssl/ts.h>
 #include "ts_local.h"
 
-DEFINE_STACK_OF(X509_EXTENSION)
-
 int TS_REQ_set_version(TS_REQ *a, long version)
 {
     return ASN1_INTEGER_set(a->version, version);

diff --git a/crypto/ts/ts_rsp_sign.c b/crypto/ts/ts_rsp_sign.c
index 33f2b511e80fe052dd138cc8ed30c1d9fda4e095..a1904719cc7356a021c9c24d0cc8b20221a8700c 100644 (file)
--- a/crypto/ts/ts_rsp_sign.c
+++ b/crypto/ts/ts_rsp_sign.c
@@ -17,8 +17,6 @@
 #include "ts_local.h"
 #include "crypto/ess.h"
 
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_EXTENSION)
 DEFINE_STACK_OF(ASN1_UTF8STRING)
 DEFINE_STACK_OF(ASN1_OBJECT)
 DEFINE_STACK_OF_CONST(EVP_MD)

diff --git a/crypto/ts/ts_rsp_utils.c b/crypto/ts/ts_rsp_utils.c
index 86e1a9d49d3c3557f8beca10b18a184dde1c9c5b..92dcb5bff7f06ee7fe5b336f74ad2e35c670f7e6 100644 (file)
--- a/crypto/ts/ts_rsp_utils.c
+++ b/crypto/ts/ts_rsp_utils.c
@@ -14,8 +14,6 @@
 #include <openssl/pkcs7.h>
 #include "ts_local.h"
 
-DEFINE_STACK_OF(X509_EXTENSION)
-
 int TS_RESP_set_status_info(TS_RESP *a, TS_STATUS_INFO *status_info)
 {
     TS_STATUS_INFO *new_status_info;

diff --git a/crypto/ts/ts_rsp_verify.c b/crypto/ts/ts_rsp_verify.c
index c909b211d46734cd1e350279c75d08ddd3e20b7b..1ca14bc0563b9760ad8d9c7453c6eed4acf94bb1 100644 (file)
--- a/crypto/ts/ts_rsp_verify.c
+++ b/crypto/ts/ts_rsp_verify.c
@@ -16,7 +16,6 @@
 #include "crypto/ess.h"
 
 DEFINE_STACK_OF(PKCS7_SIGNER_INFO)
-DEFINE_STACK_OF(X509)
 DEFINE_STACK_OF(ESS_CERT_ID)
 DEFINE_STACK_OF(ESS_CERT_ID_V2)
 DEFINE_STACK_OF(ASN1_UTF8STRING)

diff --git a/crypto/ts/ts_verify_ctx.c b/crypto/ts/ts_verify_ctx.c
index 2c95fd1f14202abeb14abc97ba55fec571512766..776d5cf43e2d947e53d1549c077b91694ec5daa2 100644 (file)
--- a/crypto/ts/ts_verify_ctx.c
+++ b/crypto/ts/ts_verify_ctx.c
@@ -12,8 +12,6 @@
 #include <openssl/ts.h>
 #include "ts_local.h"
 
-DEFINE_STACK_OF(X509)
-
 TS_VERIFY_CTX *TS_VERIFY_CTX_new(void)
 {
     TS_VERIFY_CTX *ctx = OPENSSL_zalloc(sizeof(*ctx));

diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c
index d5e6dde4f8df75fc732a7cdb3b3985f79688cc3e..a4ec328312bf28a734098745d560674ba96a6082 100644 (file)
--- a/crypto/x509/by_file.c
+++ b/crypto/x509/by_file.c
@@ -17,8 +17,6 @@
 #include <openssl/pem.h>
 #include "x509_local.h"
 
-DEFINE_STACK_OF(X509_INFO)
-
 static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
                         long argl, char **ret);
 static int by_file_ctrl_with_libctx(X509_LOOKUP *ctx, int cmd,

diff --git a/crypto/x509/pcy_tree.c b/crypto/x509/pcy_tree.c
index 30879197f8040a910c3a3ef953aedcf58e67a218..8b127cf291c164a528d70b644d5046ab06241c4d 100644 (file)
--- a/crypto/x509/pcy_tree.c
+++ b/crypto/x509/pcy_tree.c
@@ -15,7 +15,6 @@
 #include "pcy_local.h"
 
 DEFINE_STACK_OF(ASN1_OBJECT)
-DEFINE_STACK_OF(X509)
 DEFINE_STACK_OF(X509_POLICY_NODE)
 
 static void expected_print(BIO *channel,

diff --git a/crypto/x509/t_crl.c b/crypto/x509/t_crl.c
index 0824bb6defa6225ed619c615e7a76c9e74987889..44be2f237b9ad348007fc466f793361e9ce561e7 100644 (file)
--- a/crypto/x509/t_crl.c
+++ b/crypto/x509/t_crl.c
@@ -15,8 +15,6 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 
-DEFINE_STACK_OF(X509_REVOKED)
-
 #ifndef OPENSSL_NO_STDIO
 int X509_CRL_print_fp(FILE *fp, X509_CRL *x)
 {

diff --git a/crypto/x509/t_req.c b/crypto/x509/t_req.c
index e1ee12de95d434154dfb8cd180aad295bbcc86dd..abcca0a8f5fc7f131d3b6a73a6bfb9f65175174b 100644 (file)
--- a/crypto/x509/t_req.c
+++ b/crypto/x509/t_req.c
@@ -17,8 +17,6 @@
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
 
-DEFINE_STACK_OF(X509_EXTENSION)
-
 #ifndef OPENSSL_NO_STDIO
 int X509_REQ_print_fp(FILE *fp, X509_REQ *x)
 {

diff --git a/crypto/x509/t_x509.c b/crypto/x509/t_x509.c
index f0240f12c39b808c622160083dd6261b8bd421cd..8f4b8e82228472b01ec9485ccfa5602dc6594661 100644 (file)
--- a/crypto/x509/t_x509.c
+++ b/crypto/x509/t_x509.c
@@ -17,7 +17,6 @@
 #include "crypto/asn1.h"
 #include "crypto/x509.h"
 
-DEFINE_STACK_OF(X509)
 DEFINE_STACK_OF(ASN1_OBJECT)
 
 #ifndef OPENSSL_NO_STDIO

diff --git a/crypto/x509/v3_addr.c b/crypto/x509/v3_addr.c
index d965d745534d8fe23931b0d7649d472e2dd90352..b369f79d01c39bbc84ff136cfe5dd5def140962c 100644 (file)
--- a/crypto/x509/v3_addr.c
+++ b/crypto/x509/v3_addr.c
@@ -29,7 +29,6 @@
 DEFINE_STACK_OF(IPAddressOrRange)
 DEFINE_STACK_OF(IPAddressFamily)
 DEFINE_STACK_OF(CONF_VALUE)
-DEFINE_STACK_OF(X509)
 
 /*
  * OpenSSL ASN.1 template translation of RFC 3779 2.2.3.

diff --git a/crypto/x509/v3_asid.c b/crypto/x509/v3_asid.c
index 0fc7641386657974dec336ab0fe65540d79d920c..e5fcff5522b651dedf87044c8ee2820405d5ade7 100644 (file)
--- a/crypto/x509/v3_asid.c
+++ b/crypto/x509/v3_asid.c
@@ -58,7 +58,6 @@ IMPLEMENT_ASN1_FUNCTIONS(ASIdentifiers)
 
 DEFINE_STACK_OF(ASIdOrRange)
 DEFINE_STACK_OF(CONF_VALUE)
-DEFINE_STACK_OF(X509)
 
 /*
  * i2r method for an ASIdentifierChoice.

diff --git a/crypto/x509/v3_conf.c b/crypto/x509/v3_conf.c
index 88e29f9cc4eacdba9674b1e681423c0e154e1f3b..3471ce098fceedfd6c133407403939fb3faea5d6 100644 (file)
--- a/crypto/x509/v3_conf.c
+++ b/crypto/x509/v3_conf.c
@@ -18,7 +18,6 @@
 #include <openssl/x509v3.h>
 
 DEFINE_STACK_OF(CONF_VALUE)
-DEFINE_STACK_OF(X509_EXTENSION)
 
 static int v3_check_critical(const char **value);
 static int v3_check_generic(const char **value);

diff --git a/crypto/x509/v3_crld.c b/crypto/x509/v3_crld.c
index 8b4e100714a2d7887c652672e7a8e16a07c4e77c..2daaad84c1a93bad3d2ec27ad63f689b6a2f02d9 100644 (file)
--- a/crypto/x509/v3_crld.c
+++ b/crypto/x509/v3_crld.c
@@ -21,7 +21,6 @@
 DEFINE_STACK_OF(CONF_VALUE)
 DEFINE_STACK_OF(GENERAL_NAME)
 DEFINE_STACK_OF(DIST_POINT)
-DEFINE_STACK_OF(X509_NAME_ENTRY)
 
 static void *v2i_crld(const X509V3_EXT_METHOD *method,
                       X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);

diff --git a/crypto/x509/v3_lib.c b/crypto/x509/v3_lib.c
index b1e32bb419359546be93f4a50c10235c6d48ead6..093e33b1023a3dd26957dcbba37521bd9cdd900c 100644 (file)
--- a/crypto/x509/v3_lib.c
+++ b/crypto/x509/v3_lib.c
@@ -17,7 +17,6 @@
 #include "ext_dat.h"
 
 DEFINE_STACK_OF(X509V3_EXT_METHOD)
-DEFINE_STACK_OF(X509_EXTENSION)
 
 static STACK_OF(X509V3_EXT_METHOD) *ext_list = NULL;
 

diff --git a/crypto/x509/v3_prn.c b/crypto/x509/v3_prn.c
index 4b2ad2685b74f34ef55bca85da2842c389259d20..de39a0f0b0db351e73a33db5cac0e084c1414a97 100644 (file)
--- a/crypto/x509/v3_prn.c
+++ b/crypto/x509/v3_prn.c
@@ -15,7 +15,6 @@
 #include <openssl/x509v3.h>
 
 DEFINE_STACK_OF(CONF_VALUE)
-DEFINE_STACK_OF(X509_EXTENSION)
 
 /* Extension printing routines */
 

diff --git a/crypto/x509/v3_utl.c b/crypto/x509/v3_utl.c
index e31be45e03cad7785955fe78b8407556583c714c..ce64aa658bf1d55d38d3f32ec1b6b76ba453cf7d 100644 (file)
--- a/crypto/x509/v3_utl.c
+++ b/crypto/x509/v3_utl.c
@@ -24,7 +24,6 @@
 DEFINE_STACK_OF(CONF_VALUE)
 DEFINE_STACK_OF(GENERAL_NAME)
 DEFINE_STACK_OF(ACCESS_DESCRIPTION)
-DEFINE_STACK_OF(X509_EXTENSION)
 DEFINE_STACK_OF_STRING()
 
 static char *strip_spaces(char *name);

diff --git a/crypto/x509/x509_att.c b/crypto/x509/x509_att.c
index ce003615ec75dcec8cda182472988c363e2f05b0..bb4bfe03f4a9d982ccfdeadf5606b97584e1d28b 100644 (file)
--- a/crypto/x509/x509_att.c
+++ b/crypto/x509/x509_att.c
@@ -17,7 +17,6 @@
 #include <openssl/x509v3.h>
 #include "x509_local.h"
 
-DEFINE_STACK_OF(X509_ATTRIBUTE)
 DEFINE_STACK_OF(ASN1_TYPE)
 
 int X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x)

diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c
index 32e15682b1e640d8663adcc37fd0d990545b2eca..e74c842fdca531e82bb3fb383daa048b76732e9d 100644 (file)
--- a/crypto/x509/x509_cmp.c
+++ b/crypto/x509/x509_cmp.c
@@ -16,8 +16,6 @@
 #include <openssl/core_names.h>
 #include "crypto/x509.h"
 
-DEFINE_STACK_OF(X509)
-
 int X509_issuer_and_serial_cmp(const X509 *a, const X509 *b)
 {
     int i;

diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
index f37e09dcdfdd2879b79b29e2dec4faa7bc8f646d..77488b6e050f49ff6f784cb28b26ec6b4f7b4f27 100644 (file)
--- a/crypto/x509/x509_lu.c
+++ b/crypto/x509/x509_lu.c
@@ -17,8 +17,6 @@
 
 DEFINE_STACK_OF(X509_LOOKUP)
 DEFINE_STACK_OF(X509_OBJECT)
-DEFINE_STACK_OF(X509_CRL)
-DEFINE_STACK_OF(X509)
 
 X509_LOOKUP *X509_LOOKUP_new(X509_LOOKUP_METHOD *method)
 {

diff --git a/crypto/x509/x509_obj.c b/crypto/x509/x509_obj.c
index 7bed79a2d526413cbc028dfbf1f6d99ec3407ccd..0acfaa35892ef51fad33fa42b8e9c9fe44d0483c 100644 (file)
--- a/crypto/x509/x509_obj.c
+++ b/crypto/x509/x509_obj.c
@@ -15,8 +15,6 @@
 #include "crypto/x509.h"
 #include "crypto/ctype.h"
 
-DEFINE_STACK_OF(X509_NAME_ENTRY)
-
 /*
  * Limit to ensure we don't overflow: much greater than
  * anything encountered in practice.

diff --git a/crypto/x509/x509_r2x.c b/crypto/x509/x509_r2x.c
index a284bf72cabc432f51623e5702dc76a14e7d73ad..a03ba24926478c86b5dea3950c4bf0bf8ae373d1 100644 (file)
--- a/crypto/x509/x509_r2x.c
+++ b/crypto/x509/x509_r2x.c
@@ -17,8 +17,6 @@
 #include <openssl/objects.h>
 #include <openssl/buffer.h>
 
-DEFINE_STACK_OF(X509_ATTRIBUTE)
-
 X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
 {
     X509 *ret = NULL;

diff --git a/crypto/x509/x509_trs.c b/crypto/x509/x509_trs.c
index ebd45b68b030e586edea7f90e72c259403027906..92e2220a13b86270d0975ed1469a1266de8fb9ff 100644 (file)
--- a/crypto/x509/x509_trs.c
+++ b/crypto/x509/x509_trs.c
@@ -12,7 +12,6 @@
 #include <openssl/x509v3.h>
 #include "crypto/x509.h"
 
-DEFINE_STACK_OF(X509_TRUST)
 DEFINE_STACK_OF(ASN1_OBJECT)
 
 static int tr_cmp(const X509_TRUST *const *a, const X509_TRUST *const *b);

diff --git a/crypto/x509/x509_v3.c b/crypto/x509/x509_v3.c
index f0596672631cd37a2451ff70f6cd8cde203a05c8..96ba940aa4c4439ce5492fa2287141c3ca66fae7 100644 (file)
--- a/crypto/x509/x509_v3.c
+++ b/crypto/x509/x509_v3.c
@@ -17,8 +17,6 @@
 #include <openssl/x509v3.h>
 #include "x509_local.h"
 
-DEFINE_STACK_OF(X509_EXTENSION)
-
 int X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *x)
 {
     if (x == NULL)

diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index 4a067e5ff4f3e4a248cdd8abe488ea43cab85a70..cc264d0fa86fc92da5fa53608797e363a31abc28 100644 (file)
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -25,11 +25,7 @@
 #include "crypto/x509.h"
 #include "x509_local.h"
 
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_EXTENSION)
-DEFINE_STACK_OF(X509_REVOKED)
 DEFINE_STACK_OF(GENERAL_NAME)
-DEFINE_STACK_OF(X509_CRL)
 DEFINE_STACK_OF(DIST_POINT)
 DEFINE_STACK_OF_STRING()
 

diff --git a/crypto/x509/x509cset.c b/crypto/x509/x509cset.c
index d5b37780355748696db0fb65e6fe157ca2162025..22143da65e1f62f04586c99a7188209a657f91d3 100644 (file)
--- a/crypto/x509/x509cset.c
+++ b/crypto/x509/x509cset.c
@@ -16,8 +16,6 @@
 #include <openssl/x509.h>
 #include "crypto/x509.h"
 
-DEFINE_STACK_OF(X509_REVOKED)
-
 int X509_CRL_set_version(X509_CRL *x, long version)
 {
     if (x == NULL)

diff --git a/crypto/x509/x509name.c b/crypto/x509/x509name.c
index 7e2704fb68aff15ebfcbbbe92c11e88126747a5e..b00e5f5b380691dd53912d1e89388c7a9bdf0dd7 100644 (file)
--- a/crypto/x509/x509name.c
+++ b/crypto/x509/x509name.c
@@ -16,8 +16,6 @@
 #include <openssl/x509.h>
 #include "crypto/x509.h"
 
-DEFINE_STACK_OF(X509_NAME_ENTRY)
-
 int X509_NAME_get_text_by_NID(const X509_NAME *name, int nid,
                               char *buf, int len)
 {

diff --git a/crypto/x509/x_crl.c b/crypto/x509/x_crl.c
index 44f374aed364baef765cf2c66eaa95a045a56ff5..21dffc8b6ee3cf95e653aa60ada79503de795cd8 100644 (file)
--- a/crypto/x509/x_crl.c
+++ b/crypto/x509/x_crl.c
@@ -17,8 +17,6 @@
 
 DEFINE_STACK_OF(GENERAL_NAME)
 DEFINE_STACK_OF(GENERAL_NAMES)
-DEFINE_STACK_OF(X509_REVOKED)
-DEFINE_STACK_OF(X509_EXTENSION)
 
 static int X509_REVOKED_cmp(const X509_REVOKED *const *a,
                             const X509_REVOKED *const *b);

diff --git a/crypto/x509/x_name.c b/crypto/x509/x_name.c
index 2db9aa34caac596c45a934e297afc14d67d272b2..1a57b2232d20902605ad000173995ed8e88fedc3 100644 (file)
--- a/crypto/x509/x_name.c
+++ b/crypto/x509/x_name.c
@@ -16,7 +16,6 @@
 #include "crypto/asn1.h"
 #include "x509_local.h"
 
-DEFINE_STACK_OF(X509_NAME_ENTRY)
 DEFINE_STACK_OF(ASN1_VALUE)
 
 /*

diff --git a/crypto/x509/x_req.c b/crypto/x509/x_req.c
index 10b82df5599129e2e58e3c51b7f511ff63369340..21215b4778001712152acc4eefe7eff41118dfd5 100644 (file)
--- a/crypto/x509/x_req.c
+++ b/crypto/x509/x_req.c
@@ -13,8 +13,6 @@
 #include <openssl/x509.h>
 #include "crypto/x509.h"
 
-DEFINE_STACK_OF(X509_ATTRIBUTE)
-
 /*-
  * X509_REQ_INFO is handled in an unusual way to get round
  * invalid encodings. Some broken certificate requests don't

diff --git a/engines/e_capi.c b/engines/e_capi.c
index cff57d69e8c88fd8df8992ba82b749c73d4e7697..8e5693d25e0a60eed8d31fbacc281050d80b7b53 100644 (file)
--- a/engines/e_capi.c
+++ b/engines/e_capi.c
@@ -34,9 +34,6 @@
 #  include <openssl/rsa.h>
 #  include <openssl/dsa.h>
 
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_NAME)
-
 /*
  * This module uses several "new" interfaces, among which is
  * CertGetCertificateContextProperty. CERT_KEY_PROV_INFO_PROP_ID is

diff --git a/engines/e_loader_attic.c b/engines/e_loader_attic.c
index 581bfb02853a64de2937604c42d84938f6c4d4a3..be01c557187772e6c4069d0f22e9e35a133f5298 100644 (file)
--- a/engines/e_loader_attic.c
+++ b/engines/e_loader_attic.c
@@ -37,7 +37,6 @@
 
 #include "e_loader_attic_err.c"
 
-DEFINE_STACK_OF(X509)
 DEFINE_STACK_OF(OSSL_STORE_INFO)
 
 #ifdef _WIN32

diff --git a/include/openssl/x509.h b/include/openssl/x509.h.in
similarity index 98%
rename from include/openssl/x509.h
rename to include/openssl/x509.h.in
index bbe2d62cf9b1553e9d1f6e4bcda1d71a9c178da0..bded195d7810bc2b4ca54439ee0e1582c36aeb65 100644 (file)
--- a/include/openssl/x509.h
+++ b/include/openssl/x509.h.in
@@ -1,4 +1,6 @@
 /*
+ * {- join("\n * ", @autowarntext) -}
+ *
  * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
@@ -8,6 +10,10 @@
  * https://www.openssl.org/source/license.html
  */
 
+{-
+use OpenSSL::stackhash qw(generate_stack_macros generate_const_stack_macros);
+-}
+
 #ifndef OPENSSL_X509_H
 # define OPENSSL_X509_H
 # pragma once
@@ -41,10 +47,12 @@ extern "C" {
 #endif
 
 /* Needed stacks for types defined in other headers */
-DEFINE_OR_DECLARE_STACK_OF(X509_NAME)
-DEFINE_OR_DECLARE_STACK_OF(X509)
-DEFINE_OR_DECLARE_STACK_OF(X509_REVOKED)
-DEFINE_OR_DECLARE_STACK_OF(X509_CRL)
+{-
+    generate_stack_macros("X509_NAME")
+    .generate_stack_macros("X509")
+    .generate_stack_macros("X509_REVOKED")
+    .generate_stack_macros("X509_CRL");
+-}
 
 /* Flags for X509_get_signature_info() */
 /* Signature info is valid */
@@ -82,16 +90,22 @@ typedef struct X509_val_st {
 typedef struct X509_sig_st X509_SIG;
 
 typedef struct X509_name_entry_st X509_NAME_ENTRY;
-DEFINE_OR_DECLARE_STACK_OF(X509_NAME_ENTRY)
 
+{-
+    generate_stack_macros("X509_NAME_ENTRY");
+-}
 
 # define X509_EX_V_NETSCAPE_HACK         0x8000
 # define X509_EX_V_INIT                  0x0001
 typedef struct X509_extension_st X509_EXTENSION;
-DEFINE_OR_DECLARE_STACK_OF(X509_EXTENSION)
+{-
+    generate_stack_macros("X509_EXTENSION");
+-}
 typedef STACK_OF(X509_EXTENSION) X509_EXTENSIONS;
 typedef struct x509_attributes_st X509_ATTRIBUTE;
-DEFINE_OR_DECLARE_STACK_OF(X509_ATTRIBUTE)
+{-
+    generate_stack_macros("X509_ATTRIBUTE");
+-}
 typedef struct X509_req_info_st X509_REQ_INFO;
 typedef struct X509_req_st X509_REQ;
 typedef struct x509_cert_aux_st X509_CERT_AUX;
@@ -107,7 +121,9 @@ typedef struct x509_trust_st {
     int arg1;
     void *arg2;
 } X509_TRUST;
-DEFINE_OR_DECLARE_STACK_OF(X509_TRUST)
+{-
+    generate_stack_macros("X509_TRUST");
+-}
 
 
 /* standard trust ids */
@@ -246,7 +262,9 @@ typedef struct X509_info_st {
     int enc_len;
     char *enc_data;
 } X509_INFO;
-DEFINE_OR_DECLARE_STACK_OF(X509_INFO)
+{-
+    generate_stack_macros("X509_INFO");
+-}
 
 /*
  * The next 2 structures and their 8 routines are used to manipulate Netscape's

diff --git a/providers/implementations/storemgmt/file_store.c b/providers/implementations/storemgmt/file_store.c
index 70dbac600bd05446bdb64151ff866e508e4ec570..ee64fd9fe82208235dd9f696f5a2cf9cd6716c22 100644 (file)
--- a/providers/implementations/storemgmt/file_store.c
+++ b/providers/implementations/storemgmt/file_store.c
@@ -33,7 +33,6 @@
 #include "prov/providercommonerr.h"
 #include "file_store_local.h"
 
-DEFINE_STACK_OF(X509)
 DEFINE_STACK_OF(OSSL_STORE_INFO)
 
 #ifdef _WIN32

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index c49f2118cae632d30ad718faeea3b77d8bf7ca53..88bab0edc410d13db0af52094411ee344a2eaea6 100644 (file)
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -20,9 +20,6 @@
 #include <openssl/x509v3.h>
 #include "internal/cryptlib.h"
 
-DEFINE_STACK_OF(X509_NAME)
-DEFINE_STACK_OF(X509)
-
 #define TLS13_NUM_CIPHERS       OSSL_NELEM(tls13_ciphers)
 #define SSL3_NUM_CIPHERS        OSSL_NELEM(ssl3_ciphers)
 #define SSL3_NUM_SCSVS          OSSL_NELEM(ssl3_scsvs)

diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index e6262bfaeb2809e9036b4562ef22a0526037e574..ace164f673bf7d8c7841282151b2b983f9981d4b 100644 (file)
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -25,9 +25,6 @@
 #include "ssl_cert_table.h"
 #include "internal/thread_once.h"
 
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_NAME)
-
 static int ssl_security_default_callback(const SSL *s, const SSL_CTX *ctx,
                                          int op, int bits, int nid, void *other,
                                          void *ex);

diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c
index 56590da207c84dc6165b118ba8df1f88b50fad18..acf938578547bd4f3a1e634d1d698ff9ef05444d 100644 (file)
--- a/ssl/ssl_conf.c
+++ b/ssl/ssl_conf.c
@@ -14,8 +14,6 @@
 #include <openssl/dh.h>
 #include "internal/nelem.h"
 
-DEFINE_STACK_OF(X509_NAME)
-
 /*
  * structure holding name tables. This is used for permitted elements in lists
  * such as TLSv1.

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 139fd628af198dca0868f76676ad94a42f0d5240..ccb0a6087fde2854c39a16f477ead6ed8f9ee4c1 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -28,9 +28,6 @@
 #include "internal/refcount.h"
 #include "internal/ktls.h"
 
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_NAME)
-DEFINE_STACK_OF(X509_EXTENSION)
 DEFINE_STACK_OF(OCSP_RESPID)
 DEFINE_STACK_OF(SCT)
 

diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c
index 144dd2c374f32bc835befdd71963f8010c885a63..3a28b60ba60effceaca98ea680feab6f66928d2d 100644 (file)
--- a/ssl/ssl_rsa.c
+++ b/ssl/ssl_rsa.c
@@ -17,8 +17,6 @@
 #include <openssl/x509v3.h>
 #include <openssl/pem.h>
 
-DEFINE_STACK_OF(X509)
-
 static int ssl_set_cert(CERT *c, X509 *x509);
 static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey);
 

diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index 63624e9e80a2ac0460c6daf51777df67bcc4c784..83fc149cfdc1b07375a06937e6f08f801b861170 100644 (file)
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -19,8 +19,6 @@
 #include "ssl_local.h"
 #include "statem/statem_local.h"
 
-DEFINE_STACK_OF(X509)
-
 static void SSL_SESSION_list_remove(SSL_CTX *ctx, SSL_SESSION *s);
 static void SSL_SESSION_list_add(SSL_CTX *ctx, SSL_SESSION *s);
 static int remove_session_lock(SSL_CTX *ctx, SSL_SESSION *c, int lck);

diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
index c842e20fbfaaafd78f2a58ae0cb0a33907ce2879..ec38b2f6a00cd7f0915e9e234796bb03963e30af 100644 (file)
--- a/ssl/statem/extensions.c
+++ b/ssl/statem/extensions.c
@@ -14,8 +14,6 @@
 #include "statem_local.h"
 #include "internal/cryptlib.h"
 
-DEFINE_STACK_OF(X509_NAME)
-
 static int final_renegotiate(SSL *s, unsigned int context, int sent);
 static int init_server_name(SSL *s, unsigned int context);
 static int final_server_name(SSL *s, unsigned int context, int sent);

diff --git a/ssl/statem/extensions_srvr.c b/ssl/statem/extensions_srvr.c
index c686d00f0e6a8059242868d4eae3366fb46843ab..6adb9cab8211a098873f1fd6cc68822550ef3424 100644 (file)
--- a/ssl/statem/extensions_srvr.c
+++ b/ssl/statem/extensions_srvr.c
@@ -13,7 +13,6 @@
 #include "internal/cryptlib.h"
 
 DEFINE_STACK_OF(OCSP_RESPID)
-DEFINE_STACK_OF(X509_EXTENSION)
 
 #define COOKIE_STATE_FORMAT_VERSION     0
 

diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index f8a3d25c0801bfc34b4014fb7f81817a15302aa7..a3e7b5ad0ad1c362598a6df5c4f4c7248445581f 100644 (file)
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -28,8 +28,6 @@
 #include <openssl/trace.h>
 #include <internal/cryptlib.h>
 
-DEFINE_STACK_OF(X509)
-
 static MSG_PROCESS_RETURN tls_process_as_hello_retry_request(SSL *s, PACKET *pkt);
 static MSG_PROCESS_RETURN tls_process_encrypted_extensions(SSL *s, PACKET *pkt);
 

diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index 79195b2aa2070afd57f98bbe43724c3235d5473c..6d0efb3239bc01ee834b23a9ac3b36933f4819f8 100644 (file)
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -21,9 +21,6 @@
 #include <openssl/x509.h>
 #include <openssl/trace.h>
 
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_NAME)
-
 /*
  * Map error codes to TLS/SSL alart types.
  */

diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index f42e7865ebbb56a9ec4e68008d19ba3bf6e93c00..a1a28e905afb46ccf36f70e951c558992a6a953b 100644 (file)
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -26,8 +26,6 @@
 #include <openssl/core_names.h>
 #include <openssl/asn1t.h>
 
-DEFINE_STACK_OF(X509)
-
 #define TICKET_NONCE_SIZE       8
 
 typedef struct {

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 702622487f99ce9c6798f51ad5b1546a0af8539e..f2043aef7e5e65e76e7210c816b937f9ea6c6695 100644 (file)
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -28,9 +28,6 @@
 #include "ssl_local.h"
 #include <openssl/ct.h>
 
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_NAME)
-
 static const SIGALG_LOOKUP *find_sig_alg(SSL *s, X509 *x, EVP_PKEY *pkey);
 static int tls12_sigalg_allowed(const SSL *s, int op, const SIGALG_LOOKUP *lu);
 

diff --git a/test/cmp_client_test.c b/test/cmp_client_test.c
index 9043ee1196896dc58046eee950a522bf59573753..9c72c58ad367dbfc938f12e970818ebe308e9caf 100644 (file)
--- a/test/cmp_client_test.c
+++ b/test/cmp_client_test.c
@@ -15,7 +15,6 @@
 
 #ifndef NDEBUG /* tests need mock server, which is available only if !NDEBUG */
 
-DEFINE_STACK_OF(X509)
 DEFINE_STACK_OF(OSSL_CMP_ITAV)
 
 static const char *server_key_f;

diff --git a/test/cmp_ctx_test.c b/test/cmp_ctx_test.c
index 8b797f2e9809b789f306627c35225f7c9cfb6f44..f3f49888bcb1d3103cc2e05ef4d4ec63b153653a 100644 (file)
--- a/test/cmp_ctx_test.c
+++ b/test/cmp_ctx_test.c
@@ -13,9 +13,7 @@
 
 #include <openssl/x509_vfy.h>
 
-DEFINE_STACK_OF(X509)
 DEFINE_STACK_OF(ASN1_UTF8STRING)
-DEFINE_STACK_OF(X509_EXTENSION)
 DEFINE_STACK_OF(OSSL_CMP_ITAV)
 DEFINE_STACK_OF(POLICYINFO)
 

diff --git a/test/cmp_protect_test.c b/test/cmp_protect_test.c
index 7132ccc5cbe2ac8af11af1ef8df3a5c1ca5b6a70..8f76a14222c67f7cefc61e59447ebb57070dd0c1 100644 (file)
--- a/test/cmp_protect_test.c
+++ b/test/cmp_protect_test.c
@@ -11,8 +11,6 @@
 
 #include "cmp_testlib.h"
 
-DEFINE_STACK_OF(X509)
-
 static const char *ir_protected_f;
 static const char *ir_unprotected_f;
 static const char *ip_PBM_f;

diff --git a/test/cmp_testlib.c b/test/cmp_testlib.c
index 754a6ba84509e5be2e61c00d197d97869f7c417d..7a8570afeb58a65bc867792b5f7a06e27a52d956 100644 (file)
--- a/test/cmp_testlib.c
+++ b/test/cmp_testlib.c
@@ -12,8 +12,6 @@
 #include "cmp_testlib.h"
 #include <openssl/rsa.h> /* needed in case config no-deprecated */
 
-DEFINE_STACK_OF(X509)
-
 EVP_PKEY *load_pem_key(const char *file, OPENSSL_CTX *libctx)
 {
     EVP_PKEY *key = NULL;

diff --git a/test/cmsapitest.c b/test/cmsapitest.c
index f90200e9ac7d0312d7b35a624e6c57bda6aafa37..a69fcc949db05e7b04d0f893ffb55cf4c22f036e 100644 (file)
--- a/test/cmsapitest.c
+++ b/test/cmsapitest.c
@@ -16,8 +16,6 @@
 
 #include "testutil.h"
 
-DEFINE_STACK_OF(X509)
-
 static X509 *cert = NULL;
 static EVP_PKEY *privkey = NULL;
 

diff --git a/test/crltest.c b/test/crltest.c
index ff2fadaa6b7c2ce66ccf3fce5b95a86aa1c1102f..5d255d368a1ca506454c6cb1b74a14c49f64f662 100644 (file)
--- a/test/crltest.c
+++ b/test/crltest.c
@@ -17,9 +17,6 @@
 
 #include "testutil.h"
 
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_CRL)
-
 #define PARAM_TIME 1474934400 /* Sep 27th, 2016 */
 
 static const char *kCRLTestRoot[] = {

diff --git a/test/danetest.c b/test/danetest.c
index 96b9579f3ce961253e1d7554f712081f03786bbf..b0d6ffe563b8a28488732d06507f659c8e624562 100644 (file)
--- a/test/danetest.c
+++ b/test/danetest.c
@@ -26,8 +26,6 @@
 
 #include "internal/nelem.h"
 
-DEFINE_STACK_OF(X509)
-
 #define _UC(c) ((unsigned char)(c))
 
 static const char *basedomain;

diff --git a/test/handshake_helper.c b/test/handshake_helper.c
index bc6762d475c81c395734f3127ba2bdcb1d66833a..5253f0d602de3a673a70f3b275a495b9863e9a51 100644 (file)
--- a/test/handshake_helper.c
+++ b/test/handshake_helper.c
@@ -26,8 +26,6 @@
 #include <netinet/sctp.h>
 #endif
 
-DEFINE_STACK_OF(X509_NAME)
-
 HANDSHAKE_RESULT *HANDSHAKE_RESULT_new(void)
 {
     HANDSHAKE_RESULT *ret;

diff --git a/test/ocspapitest.c b/test/ocspapitest.c
index 4ea6c636d46ebf0e61071d77641b31dcdf047438..9e8c30625996a0c17b36c0286472e8a21ae06d28 100644 (file)
--- a/test/ocspapitest.c
+++ b/test/ocspapitest.c
@@ -18,8 +18,6 @@
 
 #include "testutil.h"
 
-DEFINE_STACK_OF(X509)
-
 static const char *certstr;
 static const char *privkeystr;
 

diff --git a/test/pkcs12_helper.c b/test/pkcs12_helper.c
index 22bebe8e2ba0b1a9dc232acd09fd2fb2c770d661..a3490e74e3032da8c5a9969083b3c7ee3e4d43d2 100644 (file)
--- a/test/pkcs12_helper.c
+++ b/test/pkcs12_helper.c
@@ -21,10 +21,8 @@
 #include "testutil.h"
 #include "pkcs12_helper.h"
 
-
 DEFINE_STACK_OF(PKCS7)
 DEFINE_STACK_OF(PKCS12_SAFEBAG)
-DEFINE_STACK_OF(X509_ATTRIBUTE)
 
 /* Set this to > 0 write test data to file */
 int write_files = 0;

diff --git a/test/ssl_test.c b/test/ssl_test.c
index 18e92c7f77b88f1747cafb5d0a84694bc30f9c82..1fbe9383094f412b1482afe50a892b7829aeb8e0 100644 (file)
--- a/test/ssl_test.c
+++ b/test/ssl_test.c
@@ -19,8 +19,6 @@
 #include "ssl_test_ctx.h"
 #include "testutil.h"
 
-DEFINE_STACK_OF(X509_NAME)
-
 static CONF *conf = NULL;
 static OSSL_PROVIDER *defctxnull = NULL, *thisprov = NULL;
 static OPENSSL_CTX *libctx = NULL;

diff --git a/test/ssl_test_ctx.c b/test/ssl_test_ctx.c
index 726ee375833e3b459db6ab692892d202b1f48282..c3adb505810fd16a71f24697d73aa0c5031dc389 100644 (file)
--- a/test/ssl_test_ctx.c
+++ b/test/ssl_test_ctx.c
@@ -21,7 +21,6 @@
 #endif
 
 DEFINE_STACK_OF(CONF_VALUE)
-DEFINE_STACK_OF(X509_NAME)
 
 static const int default_app_data_size = 256;
 /* Default set to be as small as possible to exercise fragmentation. */

diff --git a/test/sslapitest.c b/test/sslapitest.c
index 240cadde90e24f626092241a6ef09afb652e93e1..2451f3f83268c67454b1b962f0bb8d1898f4ff5b 100644 (file)
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -48,8 +48,6 @@ int tls_provider_init(const OSSL_CORE_HANDLE *handle,
                       const OSSL_DISPATCH **out,
                       void **provctx);
 DEFINE_STACK_OF(OCSP_RESPID)
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_NAME)
 
 static OPENSSL_CTX *libctx = NULL;
 static OSSL_PROVIDER *defctxnull = NULL;

diff --git a/test/verify_extra_test.c b/test/verify_extra_test.c
index 99a63611420b256f9fd7bc5a9a9d934fd989221f..668b62d4080066af1686dcc7fcaf2c243b7993d7 100644 (file)
--- a/test/verify_extra_test.c
+++ b/test/verify_extra_test.c
@@ -16,8 +16,6 @@
 #include <openssl/err.h>
 #include "testutil.h"
 
-DEFINE_STACK_OF(X509)
-
 static const char *root_f;
 static const char *roots_f;
 static const char *untrusted_f;