diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-03 16:01:51 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-13 11:10:41 +0100 |
| commit | 1e14bca2332a95340366324372c59e6a78ddbad7 (patch) | |
| tree | 57de239c6315d8ba4f44c292805c25e2cdf13a84 /include | |
| parent | 0b282540158bc4a7a291af7427a8da76f0a4980a (diff) | |
Fix safestack issues in ess.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/ess.h.in (renamed from include/openssl/ess.h) | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/include/openssl/ess.h b/include/openssl/ess.h.in index 17962473c1..185bdd8f8b 100644 --- a/include/openssl/ess.h +++ b/include/openssl/ess.h.in @@ -1,4 +1,6 @@ /* + * {- join("\n * ", @autowarntext) -} + * * Copyright 2019-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_ESS_H # define OPENSSL_ESS_H @@ -24,12 +30,18 @@ typedef struct ESS_issuer_serial ESS_ISSUER_SERIAL; typedef struct ESS_cert_id ESS_CERT_ID; typedef struct ESS_signing_cert ESS_SIGNING_CERT; -DEFINE_OR_DECLARE_STACK_OF(ESS_CERT_ID) +{- + generate_stack_macros("ESS_CERT_ID"); +-} + typedef struct ESS_signing_cert_v2_st ESS_SIGNING_CERT_V2; typedef struct ESS_cert_id_v2_st ESS_CERT_ID_V2; -DEFINE_OR_DECLARE_STACK_OF(ESS_CERT_ID_V2) +{- + generate_stack_macros("ESS_CERT_ID_V2"); +-} + DECLARE_ASN1_ALLOC_FUNCTIONS(ESS_ISSUER_SERIAL) DECLARE_ASN1_ENCODE_FUNCTIONS_only(ESS_ISSUER_SERIAL, ESS_ISSUER_SERIAL) |