diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-03 15:45:01 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-13 11:10:41 +0100 |
| commit | 98c35dc48d36664c404fec2e12ce405ac0fbecc0 (patch) | |
| tree | 8bfc1804c0714c88410608ef3e48f7f01d3fdd92 /include | |
| parent | c5a5581127c75fe9e9d56d42dd6bd95eb679729f (diff) | |
Fix safestack issues in crmf.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/crmf.h.in (renamed from include/openssl/crmf.h) | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/include/openssl/crmf.h b/include/openssl/crmf.h.in index 022f0bb9d2..bc81bf591a 100644 --- a/include/openssl/crmf.h +++ b/include/openssl/crmf.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 @@ -11,6 +13,10 @@ * CRMF (RFC 4211) implementation by M. Peylo, M. Viljanen, and D. von Oheimb. */ +{- +use OpenSSL::stackhash qw(generate_stack_macros); +-} + #ifndef OPENSSL_CRMF_H # define OPENSSL_CRMF_H @@ -44,7 +50,9 @@ DECLARE_ASN1_FUNCTIONS(OSSL_CRMF_ENCRYPTEDVALUE) typedef struct ossl_crmf_msg_st OSSL_CRMF_MSG; DECLARE_ASN1_FUNCTIONS(OSSL_CRMF_MSG) DECLARE_ASN1_DUP_FUNCTION(OSSL_CRMF_MSG) -DEFINE_OR_DECLARE_STACK_OF(OSSL_CRMF_MSG) +{- + generate_stack_macros("OSSL_CRMF_MSG"); +-} typedef struct ossl_crmf_attributetypeandvalue_st OSSL_CRMF_ATTRIBUTETYPEANDVALUE; typedef struct ossl_crmf_pbmparameter_st OSSL_CRMF_PBMPARAMETER; DECLARE_ASN1_FUNCTIONS(OSSL_CRMF_PBMPARAMETER) @@ -53,7 +61,9 @@ typedef struct ossl_crmf_certrequest_st OSSL_CRMF_CERTREQUEST; typedef struct ossl_crmf_certid_st OSSL_CRMF_CERTID; DECLARE_ASN1_FUNCTIONS(OSSL_CRMF_CERTID) DECLARE_ASN1_DUP_FUNCTION(OSSL_CRMF_CERTID) -DEFINE_OR_DECLARE_STACK_OF(OSSL_CRMF_CERTID) +{- + generate_stack_macros("OSSL_CRMF_CERTID"); +-} typedef struct ossl_crmf_pkipublicationinfo_st OSSL_CRMF_PKIPUBLICATIONINFO; DECLARE_ASN1_FUNCTIONS(OSSL_CRMF_PKIPUBLICATIONINFO) |