diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-02 16:15:06 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-13 11:09:45 +0100 |
| commit | 6ac1cd10ba8a1d92d3858e53a7aea2cf444adf26 (patch) | |
| tree | 9b2ccdb7ea5335deb20cfb4d98ee23b8ae10e299 /apps | |
| parent | 08073700cc50bcd0df5c0ee68c100e300a320d03 (diff) | |
Fix safestack issues in ssl.h
We fix 3 problems with safestack:
- Including an openssl header file without linking against libcrypto
can cause compilation failures (even if the app does not otherwise need
to link against libcrypto). See issue #8102
- Recent changes means that applications in no-deprecated builds will need
to include additional macro calls in the source code for all stacks that
they need to use - which is an API break. This changes avoids that
necessity.
- It is not possible to write code using stacks that works in both a
no-deprecated and a normal build of OpenSSL. See issue #12707.
Fixes #12707
Contains a partial fix for #8102. A similar PR will be needed for hash to
fully fix.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12781)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/ciphers.c | 2 | ||||
| -rw-r--r-- | apps/s_server.c | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/apps/ciphers.c b/apps/ciphers.c index 380091f16f..500b416046 100644 --- a/apps/ciphers.c +++ b/apps/ciphers.c @@ -15,8 +15,6 @@ #include <openssl/err.h> #include <openssl/ssl.h> -DEFINE_STACK_OF_CONST(SSL_CIPHER) - typedef enum OPTION_choice { OPT_ERR = -1, OPT_EOF = 0, OPT_HELP, OPT_STDNAME, diff --git a/apps/s_server.c b/apps/s_server.c index 4c2e5b27f7..f1ea550fed 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -63,7 +63,6 @@ typedef unsigned int u_int; 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); |