VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-06 11:06:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

* modules/ssl/ssl_private.h: For OpenSSL >= 3.5.0 drop $SSLKEYLOGFILE

Browse Source 
handling inside mod_ssl where OpenSSL is built to handle that
  internally in libssl.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926720 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2025-06-25 12:53:18 +00:00
parent e5a19d43e0
commit c2ffd2a551
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/ssl/ssl_private.h
View File

@ -296,8 +296,12 @@ void free_bio_methods(void);
#define X509_get_notAfter X509_getm_notAfter #define X509_get_notAfter X509_getm_notAfter
#endif #endif
#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER) /* For OpenSSL 3.5.0+, don't handle $SSLKEYLOGFILE since libssl does -
#define HAVE_OPENSSL_KEYLOG * unless OpenSSL was built with no-sslkeylog, which drops the env var
* handling, but leaves the API intact. */
#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER) \
&& (OPENSSL_VERSION_NUMBER <= 0x30500000L || !defined(OPENSSL_NO_SSLKEYLOG))
#define HAVE_OPENSSL_KEYLOG
#endif #endif
#ifdef HAVE_FIPS #ifdef HAVE_FIPS