diff options
author | Rich Salz <rsalz@akamai.com> | 2019-12-19 17:30:24 -0500 |
---|---|---|
committer | Tomas Mraz <tmraz@fedoraproject.org> | 2020-04-24 16:42:46 +0200 |
commit | 852c2ed260860b6b85c84f9fe96fb4d23d49c9f2 (patch) | |
tree | d8104686e0a02217c13f51e5d10d7434fa13e3dc /apps/lib | |
parent | 4692e98bdbaebb6f078e89a75c54395839e68b24 (diff) |
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 <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10669)
Diffstat (limited to 'apps/lib')
-rw-r--r-- | apps/lib/apps.c | 11 | ||||
-rw-r--r-- | apps/lib/names.c | 2 | ||||
-rw-r--r-- | apps/lib/s_cb.c | 5 |
3 files changed, 18 insertions, 0 deletions
diff --git a/apps/lib/apps.c b/apps/lib/apps.c index 13ca7a12f1..5395d842eb 100644 --- a/apps/lib/apps.c +++ b/apps/lib/apps.c @@ -57,6 +57,17 @@ static int WIN32_rename(const char *from, const char *to); #define PASS_SOURCE_SIZE_MAX 4 +DEFINE_STACK_OF(CONF) +DEFINE_STACK_OF(CONF_VALUE) +DEFINE_STACK_OF(X509) +DEFINE_STACK_OF(X509_CRL) +DEFINE_STACK_OF(X509_INFO) +DEFINE_STACK_OF(X509_EXTENSION) +DEFINE_STACK_OF(X509_POLICY_NODE) +DEFINE_STACK_OF(GENERAL_NAME) +DEFINE_STACK_OF(DIST_POINT) +DEFINE_STACK_OF_STRING() + typedef struct { const char *name; unsigned long flag; diff --git a/apps/lib/names.c b/apps/lib/names.c index 09ee16fd37..a1116d68f8 100644 --- a/apps/lib/names.c +++ b/apps/lib/names.c @@ -12,6 +12,8 @@ #include <openssl/safestack.h> #include "names.h" +DEFINE_STACK_OF_CSTRING() + #ifdef _WIN32 # define strcasecmp _stricmp #endif diff --git a/apps/lib/s_cb.c b/apps/lib/s_cb.c index 16ce65d448..5f2f2792fa 100644 --- a/apps/lib/s_cb.c +++ b/apps/lib/s_cb.c @@ -26,6 +26,11 @@ #define COOKIE_SECRET_LENGTH 16 +DEFINE_STACK_OF(X509) +DEFINE_STACK_OF(X509_CRL) +DEFINE_STACK_OF(X509_NAME) +DEFINE_STACK_OF_STRING() + VERIFY_CB_ARGS verify_args = { -1, 0, X509_V_OK, 0 }; #ifndef OPENSSL_NO_SOCK |