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)

17 files changed, 0 insertions, 35 deletions

diff --git a/apps/ca.c b/apps/ca.c
index 3c2bee8..cb1c909 100644
--- 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 db0d418..4d77b54 100644
--- 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 3a08190..2c82567 100644
--- 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 d154f46..fada7b5 100644
--- 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 e0de95a..545fe0a 100644
--- 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 5d95ce0..bd6a6bc 100644
--- 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 0ae851d..b53d4cb 100644
--- 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 de18963..92ae7bd 100644
--- 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 4f42d66..ad69962 100644
--- 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 23ffa98..fddfdbc 100644
--- 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 95d3ca0..e6ac26e 100644
--- 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 866b8cf..efa0b65 100644
--- 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 2a58589..32aa6fa 100644
--- 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 f1ea550..c970080 100644
--- 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 dbfcdbe..ed3d63a 100644
--- 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 ed20b69..c43a4e6 100644
--- 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 169530f..4b2200c 100644
--- 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