From 852c2ed260860b6b85c84f9fe96fb4d23d49c9f2 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Thu, 19 Dec 2019 17:30:24 -0500 Subject: In OpenSSL builds, declare STACK for datatypes ... ... and only *define* them in the source files that need them. Use DEFINE_OR_DECLARE which is set appropriately for internal builds and not non-deprecated builds. Deprecate stack-of-block Better documentation Move some ASN1 struct typedefs to types.h Update ParseC to handle this. Most of all, ParseC needed to be more consistent. The handlers are "recursive", in so far that they are called again and again until they terminate, which depends entirely on what the "massager" returns. There's a comment at the beginning of ParseC that explains how that works. {Richard Levtte} Reviewed-by: Dmitry Belyavskiy Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/10669) --- crypto/pem/pem_info.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'crypto/pem') diff --git a/crypto/pem/pem_info.c b/crypto/pem/pem_info.c index 90162d7ddb..f6a5dedc48 100644 --- a/crypto/pem/pem_info.c +++ b/crypto/pem/pem_info.c @@ -23,6 +23,8 @@ #include #include +DEFINE_STACK_OF(X509_INFO) + #ifndef OPENSSL_NO_STDIO STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u) -- cgit v1.2.3