From 15c3dcfc78553c70439d816a9c5471b8d5a6c54f Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 3 Sep 2020 16:24:47 +0100 Subject: Fix safestack issues in crypto.h Reviewed-by: Richard Levitte Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/12781) --- crypto/dso/dso_dlfcn.c | 2 -- crypto/dso/dso_lib.c | 2 -- crypto/dso/dso_win32.c | 2 -- crypto/ex_data.c | 2 -- 4 files changed, 8 deletions(-) (limited to 'crypto') diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c index bb34c6ed42..b34984b919 100644 --- a/crypto/dso/dso_dlfcn.c +++ b/crypto/dso/dso_dlfcn.c @@ -19,8 +19,6 @@ #include "dso_local.h" #include "e_os.h" -DEFINE_STACK_OF(void) - #ifdef DSO_DLFCN # ifdef HAVE_DLFCN_H diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c index 6c347b58d6..6e2b8d944d 100644 --- a/crypto/dso/dso_lib.c +++ b/crypto/dso/dso_lib.c @@ -10,8 +10,6 @@ #include "dso_local.h" #include "internal/refcount.h" -DEFINE_STACK_OF(void) - static DSO_METHOD *default_DSO_meth = NULL; static DSO *DSO_new_method(DSO_METHOD *meth) diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c index 1472140e92..7248fc2878 100644 --- a/crypto/dso/dso_win32.c +++ b/crypto/dso/dso_win32.c @@ -69,8 +69,6 @@ static void *win32_globallookup(const char *name); static const char *openssl_strnchr(const char *string, int c, size_t len); -DEFINE_STACK_OF(void) - static DSO_METHOD dso_meth_win32 = { "OpenSSL 'win32' shared library method", win32_load, diff --git a/crypto/ex_data.c b/crypto/ex_data.c index 80a136164a..cc9ebc36f4 100644 --- a/crypto/ex_data.c +++ b/crypto/ex_data.c @@ -10,8 +10,6 @@ #include "crypto/cryptlib.h" #include "internal/thread_once.h" -DEFINE_STACK_OF(void) - int do_ex_data_init(OPENSSL_CTX *ctx) { OSSL_EX_DATA_GLOBAL *global = openssl_ctx_get_ex_data_global(ctx); -- cgit v1.2.3