diff options
author | Matt Caswell <matt@openssl.org> | 2020-09-03 10:23:44 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2020-09-13 11:09:45 +0100 |
commit | e6623cfbffcc03e2483632359e005ca13adacc9d (patch) | |
tree | 64caba9fa625624f304162011a54a55b09b0ad41 /test | |
parent | 6ac1cd10ba8a1d92d3858e53a7aea2cf444adf26 (diff) |
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)
Diffstat (limited to 'test')
-rw-r--r-- | test/cmp_client_test.c | 1 | ||||
-rw-r--r-- | test/cmp_ctx_test.c | 2 | ||||
-rw-r--r-- | test/cmp_protect_test.c | 2 | ||||
-rw-r--r-- | test/cmp_testlib.c | 2 | ||||
-rw-r--r-- | test/cmsapitest.c | 2 | ||||
-rw-r--r-- | test/crltest.c | 3 | ||||
-rw-r--r-- | test/danetest.c | 2 | ||||
-rw-r--r-- | test/handshake_helper.c | 2 | ||||
-rw-r--r-- | test/ocspapitest.c | 2 | ||||
-rw-r--r-- | test/pkcs12_helper.c | 2 | ||||
-rw-r--r-- | test/ssl_test.c | 2 | ||||
-rw-r--r-- | test/ssl_test_ctx.c | 1 | ||||
-rw-r--r-- | test/sslapitest.c | 2 | ||||
-rw-r--r-- | test/verify_extra_test.c | 2 |
14 files changed, 0 insertions, 27 deletions
diff --git a/test/cmp_client_test.c b/test/cmp_client_test.c index 9043ee1196..9c72c58ad3 100644 --- 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 8b797f2e98..f3f49888bc 100644 --- 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 7132ccc5cb..8f76a14222 100644 --- 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 754a6ba845..7a8570afeb 100644 --- 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 f90200e9ac..a69fcc949d 100644 --- 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 ff2fadaa6b..5d255d368a 100644 --- 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 96b9579f3c..b0d6ffe563 100644 --- 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 bc6762d475..5253f0d602 100644 --- 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 4ea6c636d4..9e8c306259 100644 --- 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 22bebe8e2b..a3490e74e3 100644 --- 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 18e92c7f77..1fbe938309 100644 --- 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 726ee37583..c3adb50581 100644 --- 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 240cadde90..2451f3f832 100644 --- 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 99a6361142..668b62d408 100644 --- 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; |