From 24c4ea958ecae0b194cc3eb812a81766cdb421f6 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 3 Sep 2020 14:10:41 +0100 Subject: Fix stacks of OPENSSL_STRING, OPENSSL_CSTRING and OPENSSL_BLOCK Reviewed-by: Richard Levitte Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/12781) --- test/confdump.c | 1 - test/evp_libctx_test.c | 2 -- test/evp_test.c | 2 -- test/ssltest_old.c | 2 -- 4 files changed, 7 deletions(-) (limited to 'test') diff --git a/test/confdump.c b/test/confdump.c index 3750d2cc8c..2a72f5b454 100644 --- a/test/confdump.c +++ b/test/confdump.c @@ -15,7 +15,6 @@ #include DEFINE_STACK_OF(CONF_VALUE) -DEFINE_STACK_OF_CSTRING() static STACK_OF(OPENSSL_CSTRING) *section_names = NULL; diff --git a/test/evp_libctx_test.c b/test/evp_libctx_test.c index 3b20dad74b..823cdec8e0 100644 --- a/test/evp_libctx_test.c +++ b/test/evp_libctx_test.c @@ -31,8 +31,6 @@ #include "crypto/bn_dh.h" /* _bignum_ffdhe2048_p */ #include "../e_os.h" /* strcasecmp */ -DEFINE_STACK_OF_CSTRING() - static OPENSSL_CTX *libctx = NULL; static OSSL_PROVIDER *nullprov = NULL; static OSSL_PROVIDER *libprov = NULL; diff --git a/test/evp_test.c b/test/evp_test.c index 52e1dd2e51..0b58d1f97e 100644 --- a/test/evp_test.c +++ b/test/evp_test.c @@ -27,8 +27,6 @@ #include "testutil.h" #include "evp_test.h" -DEFINE_STACK_OF_STRING() - #define AAD_NUM 4 typedef struct evp_test_method_st EVP_TEST_METHOD; diff --git a/test/ssltest_old.c b/test/ssltest_old.c index 88aef5e896..d1733912bc 100644 --- a/test/ssltest_old.c +++ b/test/ssltest_old.c @@ -81,8 +81,6 @@ # include #endif -DEFINE_STACK_OF_STRING() - static SSL_CTX *s_ctx = NULL; static SSL_CTX *s_ctx2 = NULL; -- cgit v1.2.3