VladPolskiy/apache_httpd
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-01 16:07:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

* modules/ssl/ssl_private.h: Fix logic in r1926720 HAVE_OPENSSL_KEYLOG macro,

Browse Source 
thanks to rpluem.

Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926722 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2025-06-25 15:16:22 +00:00
parent c2ffd2a551
commit 9b06444951
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/ssl/ssl_private.h
View File

@ -296,11 +296,15 @@ void free_bio_methods(void);
#define X509_get_notAfter X509_getm_notAfter
#endif
/* For OpenSSL 3.5.0+, don't handle $SSLKEYLOGFILE since libssl does -
* unless OpenSSL was built with no-sslkeylog, which drops the env var
* handling, but leaves the API intact. */
/* The SSL_CTX_set_keylog_callback() API is present in 1.1.1+.
*
* OpenSSL 3.5+ also provides optional native handling of
* $SSLKEYLOGFILE inside libssl, which duplicates the mod_ssl support.
* The mod_ssl support is hence disabled for 3.5+, unless that OpenSSL
* feature is itself disabled (and OPENSSL_NO_SSLKEYLOG is defined).
*/
#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER) \
&& (OPENSSL_VERSION_NUMBER <= 0x30500000L || !defined(OPENSSL_NO_SSLKEYLOG))
&& (OPENSSL_VERSION_NUMBER <= 0x30500000L || defined(OPENSSL_NO_SSLKEYLOG))
#define HAVE_OPENSSL_KEYLOG
#endif