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/s_server.c | |
| 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/s_server.c')
| -rw-r--r-- | apps/s_server.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index dd661ee4eb..14550aebc2 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -60,6 +60,12 @@ typedef unsigned int u_int; #endif #include "internal/sockets.h" +DEFINE_STACK_OF(X509_EXTENSION) +DEFINE_STACK_OF(X509_CRL) +DEFINE_STACK_OF(X509) +DEFINE_STACK_OF(SSL_CIPHER) +DEFINE_STACK_OF_STRING() + static int not_resumable_sess_cb(SSL *s, int is_forward_secure); static int sv_body(int s, int stype, int prot, unsigned char *context); static int www_body(int s, int stype, int prot, unsigned char *context); |