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 /include | |
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)
Diffstat (limited to 'include')
-rw-r--r-- | include/openssl/crypto.h.in (renamed from include/openssl/crypto.h) | 12 |
1 files changed, 11 insertions, 1 deletions
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. |