diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-03 16:14:28 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-13 11:11:20 +0100 |
| commit | e74e562f1c518839cc9b63aafd4af6644e01d9ca (patch) | |
| tree | ed8d2cc7f428c78fd9fc3456bafcce76e346d739 /include | |
| parent | dd731474207126615679f4cc9ae772d7da990332 (diff) | |
Fix safestack issues in conf.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/conf.h.in (renamed from include/openssl/conf.h) | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/openssl/conf.h b/include/openssl/conf.h.in index 24cdcbb1cf..2f1fceb2fb 100644 --- a/include/openssl/conf.h +++ b/include/openssl/conf.h.in @@ -1,4 +1,6 @@ /* + * {- join("\n * ", @autowarntext) -} + * * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use @@ -7,6 +9,10 @@ * https://www.openssl.org/source/license.html */ +{- +use OpenSSL::stackhash qw(generate_stack_macros); +-} + #ifndef OPENSSL_CONF_H # define OPENSSL_CONF_H # pragma once @@ -33,7 +39,9 @@ typedef struct { char *value; } CONF_VALUE; -DEFINE_OR_DECLARE_STACK_OF(CONF_VALUE) +{- + generate_stack_macros("CONF_VALUE"); +-} DEFINE_LHASH_OF(CONF_VALUE); |