include/openssl/x509v3.h: restore previous stack definition arrangement
authorRichard Levitte <levitte@openssl.org>
Mon, 27 Apr 2020 06:36:53 +0000 (08:36 +0200)
committerRichard Levitte <levitte@openssl.org>
Wed, 29 Apr 2020 04:37:10 +0000 (06:37 +0200)
commit01659135a1d8e042c6777886a74b682b32b28161
tree37e4e000fa1f9a5bbd2d6a181262a16f7389d281
parent9df3dd6b433b24805271d9db15858bdf503de193
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)
12 files changed:
crypto/x509/x_x509.c
include/openssl/asn1.h
include/openssl/cmp.h
include/openssl/conf.h
include/openssl/crmf.h
include/openssl/ess.h
include/openssl/ocsp.h
include/openssl/pkcs12.h
include/openssl/srp.h
include/openssl/ssl.h
include/openssl/x509.h
include/openssl/x509v3.h