diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-03 16:35:20 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-13 11:11:21 +0100 |
| commit | add339272773072e0d8995362c6167e515377c7f (patch) | |
| tree | 2ff7010f293d72c4a210d69969edc0f477f5c65e /include | |
| parent | 15c3dcfc78553c70439d816a9c5471b8d5a6c54f (diff) | |
Fix safestack issues in pkcs12.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/pkcs12.h.in (renamed from include/openssl/pkcs12.h) | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/openssl/pkcs12.h b/include/openssl/pkcs12.h.in index 46e95c11b6..f829dc7439 100644 --- a/include/openssl/pkcs12.h +++ b/include/openssl/pkcs12.h.in @@ -1,4 +1,6 @@ /* + * {- join("\n * ", @autowarntext) -} + * * Copyright 1999-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_PKCS12_H # define OPENSSL_PKCS12_H # pragma once @@ -52,7 +58,9 @@ typedef struct PKCS12_st PKCS12; typedef struct PKCS12_SAFEBAG_st PKCS12_SAFEBAG; -DEFINE_OR_DECLARE_STACK_OF(PKCS12_SAFEBAG) +{- + generate_stack_macros("PKCS12_SAFEBAG"); +-} typedef struct pkcs12_bag_st PKCS12_BAGS; |