Fix safestack issues in pkcs7.h

[thirdparty/openssl.git] / include / openssl / pkcs7.h.in

diff --git a/include/openssl/pkcs7.h b/include/openssl/pkcs7.h.in
similarity index 98%
rename from include/openssl/pkcs7.h
rename to include/openssl/pkcs7.h.in
index f4b75cca36b3140d20a46cf12db236b956a3bd55..93e1f9dbef31d8fc79bc89451e0006ec47a62ce1 100644 (file)
--- a/include/openssl/pkcs7.h
+++ b/include/openssl/pkcs7.h.in
@@ -1,4 +1,6 @@
 /*
+ * {- join("\n * ", @autowarntext) -}
+ *
  * Copyright 1995-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_PKCS7_H
 # define OPENSSL_PKCS7_H
 # pragma once
@@ -58,7 +64,9 @@ typedef struct pkcs7_signer_info_st {
     EVP_PKEY *pkey;
     const PKCS7_CTX *ctx;
 } PKCS7_SIGNER_INFO;
-DEFINE_OR_DECLARE_STACK_OF(PKCS7_SIGNER_INFO)
+{-
+    generate_stack_macros("PKCS7_SIGNER_INFO");
+-}
 
 typedef struct pkcs7_recip_info_st {
     ASN1_INTEGER *version;      /* version 0 */
@@ -68,7 +76,9 @@ typedef struct pkcs7_recip_info_st {
     X509 *cert;                 /* get the pub-key from this */
     const PKCS7_CTX *ctx;
 } PKCS7_RECIP_INFO;
-DEFINE_OR_DECLARE_STACK_OF(PKCS7_RECIP_INFO)
+{-
+    generate_stack_macros("PKCS7_RECIP_INFO");
+-}
 
 
 typedef struct pkcs7_signed_st {
@@ -157,7 +167,9 @@ typedef struct pkcs7_st {
     } d;
     PKCS7_CTX ctx;
 } PKCS7;
-DEFINE_OR_DECLARE_STACK_OF(PKCS7)
+{-
+    generate_stack_macros("PKCS7");
+-}
 
 
 # define PKCS7_OP_SET_DETACHED_SIGNATURE 1