diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-03 15:37:45 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-13 11:10:41 +0100 |
| commit | c5a5581127c75fe9e9d56d42dd6bd95eb679729f (patch) | |
| tree | 0d10f77ace2cd630c8e0090354955175c061b084 /include | |
| parent | 22fbfe6a7d13c7c9417f8a10103d28fe70991e94 (diff) | |
Fix safestack issues in x509_vfy.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/x509_vfy.h.in (renamed from include/openssl/x509_vfy.h) | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h.in index d43a442fc7..8a565f71a3 100644 --- a/include/openssl/x509_vfy.h +++ b/include/openssl/x509_vfy.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_X509_VFY_H # define OPENSSL_X509_VFY_H # pragma once @@ -60,9 +66,11 @@ typedef enum { #define X509_LU_FAIL 0 #endif -DEFINE_OR_DECLARE_STACK_OF(X509_LOOKUP) -DEFINE_OR_DECLARE_STACK_OF(X509_OBJECT) -DEFINE_OR_DECLARE_STACK_OF(X509_VERIFY_PARAM) +{- + generate_stack_macros("X509_LOOKUP") + .generate_stack_macros("X509_OBJECT") + .generate_stack_macros("X509_VERIFY_PARAM"); +-} int X509_STORE_set_depth(X509_STORE *store, int depth); |