summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2020-09-03 15:50:09 +0100
committerMatt Caswell <matt@openssl.org>2020-09-13 11:10:41 +0100
commit9d01ac71a06590e88791308f83c586c5d2113229 (patch)
tree0efe9d22afcaca706827364b434ec1e74ee3c7dc /include
parent98c35dc48d36664c404fec2e12ce405ac0fbecc0 (diff)
Fix safestack issues in ct.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/ct.h.in (renamed from include/openssl/ct.h)13
1 files changed, 11 insertions, 2 deletions
diff --git a/include/openssl/ct.h b/include/openssl/ct.h.in
index a69c986f06..e72fe4b6b7 100644
--- a/include/openssl/ct.h
+++ b/include/openssl/ct.h.in
@@ -1,4 +1,6 @@
/*
+ * {- join("\n * ", @autowarntext) -}
+ *
* Copyright 2016-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_CT_H
# define OPENSSL_CT_H
# pragma once
@@ -34,8 +40,11 @@ extern "C" {
/* All hashes are SHA256 in v1 of Certificate Transparency */
# define CT_V1_HASHLEN SHA256_DIGEST_LENGTH
-DEFINE_OR_DECLARE_STACK_OF(SCT)
-DEFINE_OR_DECLARE_STACK_OF(CTLOG)
+{-
+ generate_stack_macros("SCT")
+ .generate_stack_macros("CTLOG");
+-}
+
typedef enum {
CT_LOG_ENTRY_TYPE_NOT_SET = -1,