diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-02 17:15:06 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-13 12:09:45 +0200 |
| commit | 6ac1cd10ba8a1d92d3858e53a7aea2cf444adf26 (patch) | |
| tree | 9b2ccdb7ea5335deb20cfb4d98ee23b8ae10e299 /ssl/ssl_lib.c | |
| parent | NonStop port updates for 3.0.0. (diff) | |
| download | openssl-6ac1cd10ba8a1d92d3858e53a7aea2cf444adf26.tar.xz openssl-6ac1cd10ba8a1d92d3858e53a7aea2cf444adf26.zip | |
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 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index a036ac29e9..139fd628af 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -30,10 +30,8 @@ DEFINE_STACK_OF(X509) DEFINE_STACK_OF(X509_NAME) -DEFINE_STACK_OF_CONST(SSL_CIPHER) DEFINE_STACK_OF(X509_EXTENSION) DEFINE_STACK_OF(OCSP_RESPID) -DEFINE_STACK_OF(SRTP_PROTECTION_PROFILE) DEFINE_STACK_OF(SCT) static int ssl_undefined_function_1(SSL *ssl, SSL3_RECORD *r, size_t s, int t, |