diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-03 14:55:08 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-13 11:10:41 +0100 |
| commit | 904e1f92b381a15139af154ca58fd6d9f566ab2e (patch) | |
| tree | ef48b3f8b60c3ad986e0bb380440d6b6edb07873 /include | |
| parent | 798f932980e2fe656a8ba2a1bde453484f6f07dc (diff) | |
Fix safestack issues in cms.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/cms.h.in (renamed from include/openssl/cms.h) | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/include/openssl/cms.h b/include/openssl/cms.h.in index ad6718dd6f..f89cbf96e7 100644 --- a/include/openssl/cms.h +++ b/include/openssl/cms.h.in @@ -1,4 +1,6 @@ /* + * {- join("\n * ", @autowarntext) -} + * * Copyright 2008-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_CMS_H # define OPENSSL_CMS_H # pragma once @@ -36,10 +42,12 @@ typedef struct CMS_Receipt_st CMS_Receipt; typedef struct CMS_RecipientEncryptedKey_st CMS_RecipientEncryptedKey; typedef struct CMS_OtherKeyAttribute_st CMS_OtherKeyAttribute; -DEFINE_OR_DECLARE_STACK_OF(CMS_SignerInfo) -DEFINE_OR_DECLARE_STACK_OF(CMS_RecipientEncryptedKey) -DEFINE_OR_DECLARE_STACK_OF(CMS_RecipientInfo) -DEFINE_OR_DECLARE_STACK_OF(CMS_RevocationInfoChoice) +{- + generate_stack_macros("CMS_SignerInfo") + .generate_stack_macros("CMS_RecipientEncryptedKey") + .generate_stack_macros("CMS_RecipientInfo") + .generate_stack_macros("CMS_RevocationInfoChoice"); +-} DECLARE_ASN1_FUNCTIONS(CMS_ContentInfo) DECLARE_ASN1_FUNCTIONS(CMS_ReceiptRequest) |