Skip to content

Commit c2ffd2a

Browse files
committed
* modules/ssl/ssl_private.h: For OpenSSL >= 3.5.0 drop $SSLKEYLOGFILE
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
1 parent e5a19d4 commit c2ffd2a

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

modules/ssl/ssl_private.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,12 @@ void free_bio_methods(void);
296296
#define X509_get_notAfter X509_getm_notAfter
297297
#endif
298298

299-
#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
300-
#define HAVE_OPENSSL_KEYLOG
299+
/* For OpenSSL 3.5.0+, don't handle $SSLKEYLOGFILE since libssl does -
300+
* unless OpenSSL was built with no-sslkeylog, which drops the env var
301+
* handling, but leaves the API intact. */
302+
#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER) \
303+
&& (OPENSSL_VERSION_NUMBER <= 0x30500000L || !defined(OPENSSL_NO_SSLKEYLOG))
304+
#define HAVE_OPENSSL_KEYLOG
301305
#endif
302306

303307
#ifdef HAVE_FIPS

0 commit comments

Comments
 (0)