diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-03 14:45:54 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-13 11:10:40 +0100 |
| commit | 798f932980e2fe656a8ba2a1bde453484f6f07dc (patch) | |
| tree | dce53065fe04758c0cf8a1751bba33de9ce1ccfd /include | |
| parent | b4780134df95b34ae263e966e93c83594a38de5b (diff) | |
Fix safestack issues in cmp.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/cmp.h.in (renamed from include/openssl/cmp.h) | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/include/openssl/cmp.h b/include/openssl/cmp.h.in index 9fc281a705..0df3777e3c 100644 --- a/include/openssl/cmp.h +++ b/include/openssl/cmp.h.in @@ -1,4 +1,6 @@ /* + * {- join("\n * ", @autowarntext) -} + * * Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved. * Copyright Nokia 2007-2019 * Copyright Siemens AG 2015-2019 @@ -9,6 +11,10 @@ * https://www.openssl.org/source/license.html */ +{- +use OpenSSL::stackhash qw(generate_stack_macros); +-} + #ifndef OPENSSL_CMP_H # define OPENSSL_CMP_H @@ -210,21 +216,31 @@ typedef struct ossl_cmp_msg_st OSSL_CMP_MSG; DECLARE_ASN1_DUP_FUNCTION(OSSL_CMP_MSG) DECLARE_ASN1_ENCODE_FUNCTIONS(OSSL_CMP_MSG, OSSL_CMP_MSG, OSSL_CMP_MSG) typedef struct ossl_cmp_certstatus_st OSSL_CMP_CERTSTATUS; -DEFINE_OR_DECLARE_STACK_OF(OSSL_CMP_CERTSTATUS) +{- + generate_stack_macros("OSSL_CMP_CERTSTATUS"); +-} typedef struct ossl_cmp_itav_st OSSL_CMP_ITAV; DECLARE_ASN1_DUP_FUNCTION(OSSL_CMP_ITAV) -DEFINE_OR_DECLARE_STACK_OF(OSSL_CMP_ITAV) +{- + generate_stack_macros("OSSL_CMP_ITAV"); +-} typedef struct ossl_cmp_revrepcontent_st OSSL_CMP_REVREPCONTENT; typedef struct ossl_cmp_pkisi_st OSSL_CMP_PKISI; DECLARE_ASN1_FUNCTIONS(OSSL_CMP_PKISI) DECLARE_ASN1_DUP_FUNCTION(OSSL_CMP_PKISI) -DEFINE_OR_DECLARE_STACK_OF(OSSL_CMP_PKISI) +{- + generate_stack_macros("OSSL_CMP_PKISI"); +-} typedef struct ossl_cmp_certrepmessage_st OSSL_CMP_CERTREPMESSAGE; -DEFINE_OR_DECLARE_STACK_OF(OSSL_CMP_CERTREPMESSAGE) +{- + generate_stack_macros("OSSL_CMP_CERTREPMESSAGE"); +-} typedef struct ossl_cmp_pollrep_st OSSL_CMP_POLLREP; typedef STACK_OF(OSSL_CMP_POLLREP) OSSL_CMP_POLLREPCONTENT; typedef struct ossl_cmp_certresponse_st OSSL_CMP_CERTRESPONSE; -DEFINE_OR_DECLARE_STACK_OF(OSSL_CMP_CERTRESPONSE) +{- + generate_stack_macros("OSSL_CMP_CERTRESPONSE"); +-} typedef STACK_OF(ASN1_UTF8STRING) OSSL_CMP_PKIFREETEXT; /* |