diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-04-27 08:36:53 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-04-29 06:37:10 +0200 |
| commit | 01659135a1d8e042c6777886a74b682b32b28161 (patch) | |
| tree | 37e4e000fa1f9a5bbd2d6a181262a16f7389d281 /crypto/x509/x_x509.c | |
| parent | 9df3dd6b433b24805271d9db15858bdf503de193 (diff) | |
include/openssl/x509v3.h: restore previous stack definition arrangement
It turned out that configuration options may affect the definition and
use of diverse stacks and how they relate to the underlying types.
For example, the configuration option 'no-rfc3779' results in a build
error around STACK_OF(IPAddressFamily) and related stacks.
Previously, STACK_OF definitions were located near the definition of
the underlying type, which are also affected by configuration options,
which made this easier to maintain. We relocate the new stack
definitions back to those locations for that reason.
We apply the same type of relocation in other header files as well, following
the general rule that it's better to use DEFINE_OR_DECLARE_STACK_OF after the
type it defines a stack for has been defined.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11655)
Diffstat (limited to 'crypto/x509/x_x509.c')
| -rw-r--r-- | crypto/x509/x_x509.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/x509/x_x509.c b/crypto/x509/x_x509.c index 8cfdbc9fe6..8a216c49cf 100644 --- a/crypto/x509/x_x509.c +++ b/crypto/x509/x_x509.c @@ -15,7 +15,9 @@ #include <openssl/x509v3.h> #include "crypto/x509.h" +#ifndef OPENSSL_NO_RFC3779 DEFINE_STACK_OF(IPAddressFamily) +#endif ASN1_SEQUENCE_enc(X509_CINF, enc, 0) = { ASN1_EXP_OPT(X509_CINF, version, ASN1_INTEGER, 0), |