diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-03 15:05:30 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-13 11:10:41 +0100 |
| commit | fd3ed85c67174a0d3b6639ba9b237351d1c2201f (patch) | |
| tree | 13caa5fbd3ee2cca408a4e1c0611c96d13858e43 /include | |
| parent | 904e1f92b381a15139af154ca58fd6d9f566ab2e (diff) | |
Fix safestack issues in ocsp.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/ocsp.h.in (renamed from include/openssl/ocsp.h) | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/include/openssl/ocsp.h b/include/openssl/ocsp.h.in index 939a90877d..bf1e5a37fd 100644 --- a/include/openssl/ocsp.h +++ b/include/openssl/ocsp.h.in @@ -1,4 +1,6 @@ /* + * {- join("\n * ", @autowarntext) -} + * * Copyright 2000-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_OCSP_H # define OPENSSL_OCSP_H # pragma once @@ -110,8 +116,10 @@ typedef struct ocsp_req_info_st OCSP_REQINFO; typedef struct ocsp_signature_st OCSP_SIGNATURE; typedef struct ocsp_request_st OCSP_REQUEST; -DEFINE_OR_DECLARE_STACK_OF(OCSP_CERTID) -DEFINE_OR_DECLARE_STACK_OF(OCSP_ONEREQ) +{- + generate_stack_macros("OCSP_CERTID") + .generate_stack_macros("OCSP_ONEREQ"); +-} # define OCSP_RESPONSE_STATUS_SUCCESSFUL 0 # define OCSP_RESPONSE_STATUS_MALFORMEDREQUEST 1 @@ -125,7 +133,9 @@ typedef struct ocsp_resp_bytes_st OCSP_RESPBYTES; # define V_OCSP_RESPID_NAME 0 # define V_OCSP_RESPID_KEY 1 -DEFINE_OR_DECLARE_STACK_OF(OCSP_RESPID) +{- + generate_stack_macros("OCSP_RESPID"); +-} typedef struct ocsp_revoked_info_st OCSP_REVOKEDINFO; @@ -136,7 +146,9 @@ typedef struct ocsp_revoked_info_st OCSP_REVOKEDINFO; typedef struct ocsp_cert_status_st OCSP_CERTSTATUS; typedef struct ocsp_single_response_st OCSP_SINGLERESP; -DEFINE_OR_DECLARE_STACK_OF(OCSP_SINGLERESP) +{- + generate_stack_macros("OCSP_SINGLERESP"); +-} typedef struct ocsp_response_data_st OCSP_RESPDATA; |