TLS/SSL and crypto library
リビジョン | dd731474207126615679f4cc9ae772d7da990332 (tree) |
---|---|
日時 | 2020-09-13 19:10:41 |
作者 | Matt Caswell <matt@open...> |
コミッター | Matt Caswell |
Fix safestack issues in bio.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)
@@ -24,6 +24,7 @@ | ||
24 | 24 | /include/crypto/*_conf.h |
25 | 25 | /include/openssl/asn1.h |
26 | 26 | /include/openssl/asn1t.h |
27 | +/include/openssl/bio.h | |
27 | 28 | /include/openssl/cmp.h |
28 | 29 | /include/openssl/cms.h |
29 | 30 | /include/openssl/configuration.h |
@@ -15,6 +15,7 @@ DEPEND[libssl]=libcrypto | ||
15 | 15 | # unconditionally before anything else. |
16 | 16 | DEPEND[]=include/openssl/asn1.h \ |
17 | 17 | include/openssl/asn1t.h \ |
18 | + include/openssl/bio.h \ | |
18 | 19 | include/openssl/cmp.h \ |
19 | 20 | include/openssl/cms.h \ |
20 | 21 | include/openssl/configuration.h \ |
@@ -36,6 +37,7 @@ DEPEND[]=include/openssl/asn1.h \ | ||
36 | 37 | |
37 | 38 | GENERATE[include/openssl/asn1.h]=include/openssl/asn1.h.in |
38 | 39 | GENERATE[include/openssl/asn1t.h]=include/openssl/asn1t.h.in |
40 | +GENERATE[include/openssl/bio.h]=include/openssl/bio.h.in | |
39 | 41 | GENERATE[include/openssl/cmp.h]=include/openssl/cmp.h.in |
40 | 42 | GENERATE[include/openssl/cms.h]=include/openssl/cms.h.in |
41 | 43 | GENERATE[include/openssl/configuration.h]=include/openssl/configuration.h.in |
@@ -19,8 +19,6 @@ | ||
19 | 19 | #include "internal/bio.h" |
20 | 20 | #include "asn1_local.h" |
21 | 21 | |
22 | -DEFINE_STACK_OF(BIO) | |
23 | - | |
24 | 22 | /* |
25 | 23 | * Generalised MIME like utilities for streaming ASN1. Although many have a |
26 | 24 | * PKCS7/CMS like flavour others are more general purpose. |
@@ -30,8 +30,6 @@ | ||
30 | 30 | # endif |
31 | 31 | #endif |
32 | 32 | |
33 | -DEFINE_STACK_OF(BIO) | |
34 | - | |
35 | 33 | #ifndef S_ISDIR |
36 | 34 | # define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR) |
37 | 35 | #endif |
@@ -1,4 +1,6 @@ | ||
1 | 1 | /* |
2 | + * {- join("\n * ", @autowarntext) -} | |
3 | + * | |
2 | 4 | * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. |
3 | 5 | * |
4 | 6 | * Licensed under the Apache License 2.0 (the "License"). You may not use |
@@ -6,6 +8,9 @@ | ||
6 | 8 | * in the file LICENSE in the source distribution or at |
7 | 9 | * https://www.openssl.org/source/license.html |
8 | 10 | */ |
11 | +{- | |
12 | +use OpenSSL::stackhash qw(generate_stack_macros); | |
13 | +-} | |
9 | 14 | |
10 | 15 | #ifndef OPENSSL_BIO_H |
11 | 16 | # define OPENSSL_BIO_H |
@@ -287,7 +292,10 @@ int BIO_method_type(const BIO *b); | ||
287 | 292 | typedef int BIO_info_cb(BIO *, int, int); |
288 | 293 | typedef BIO_info_cb bio_info_cb; /* backward compatibility */ |
289 | 294 | |
290 | -DEFINE_OR_DECLARE_STACK_OF(BIO) | |
295 | +{- | |
296 | + generate_stack_macros("BIO"); | |
297 | +-} | |
298 | + | |
291 | 299 | |
292 | 300 | /* Prefix and suffix callback in ASN1 BIO */ |
293 | 301 | typedef int asn1_ps_func (BIO *b, unsigned char **pbuf, int *plen, |