diff options
author | Matt Caswell <matt@openssl.org> | 2020-09-03 16:24:47 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2020-09-13 11:11:21 +0100 |
commit | 15c3dcfc78553c70439d816a9c5471b8d5a6c54f (patch) | |
tree | aef31a307d8cd24a90bad5bbfb7ad1450eb66eac | |
parent | e74e562f1c518839cc9b63aafd4af6644e01d9ca (diff) |
Fix safestack issues in crypto.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)
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | build.info | 2 | ||||
-rw-r--r-- | crypto/dso/dso_dlfcn.c | 2 | ||||
-rw-r--r-- | crypto/dso/dso_lib.c | 2 | ||||
-rw-r--r-- | crypto/dso/dso_win32.c | 2 | ||||
-rw-r--r-- | crypto/ex_data.c | 2 | ||||
-rw-r--r-- | include/openssl/crypto.h.in (renamed from include/openssl/crypto.h) | 12 |
7 files changed, 14 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore index 68e7b2abd1..e7e924d74a 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ /include/openssl/conf.h /include/openssl/configuration.h /include/openssl/crmf.h +/include/openssl/crypto.h /include/openssl/ct.h /include/openssl/ess.h /include/openssl/fipskey.h diff --git a/build.info b/build.info index b091a1c346..091c4791d6 100644 --- a/build.info +++ b/build.info @@ -21,6 +21,7 @@ DEPEND[]=include/openssl/asn1.h \ include/openssl/conf.h \ include/openssl/configuration.h \ include/openssl/crmf.h \ + include/openssl/crypto.h \ include/openssl/ct.h \ include/openssl/ess.h \ include/openssl/fipskey.h \ @@ -44,6 +45,7 @@ GENERATE[include/openssl/cms.h]=include/openssl/cms.h.in GENERATE[include/openssl/conf.h]=include/openssl/conf.h.in GENERATE[include/openssl/configuration.h]=include/openssl/configuration.h.in GENERATE[include/openssl/crmf.h]=include/openssl/crmf.h.in +GENERATE[include/openssl/crypto.h]=include/openssl/crypto.h.in GENERATE[include/openssl/ct.h]=include/openssl/ct.h.in GENERATE[include/openssl/ess.h]=include/openssl/ess.h.in GENERATE[include/openssl/fipskey.h]=include/openssl/fipskey.h.in 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); diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h.in index a7c2863b54..51f1977274 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.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,11 @@ * https://www.openssl.org/source/license.html */ +{- +use OpenSSL::stackhash qw(generate_stack_macros); +-} + + #ifndef OPENSSL_CRYPTO_H # define OPENSSL_CRYPTO_H # pragma once @@ -170,7 +177,10 @@ struct crypto_ex_data_st { STACK_OF(void) *sk; }; -DEFINE_OR_DECLARE_STACK_OF(void) +{- + generate_stack_macros("void"); +-} + /* * Per class, we have a STACK of function pointers. |