This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/master by this push: new 14f47ff Disable keylog callback support for LibreSSL 14f47ff is described below commit 14f47ffea3105db6f17bee4a029eaf73e94ddee4 Author: Michael Osipov <micha...@apache.org> AuthorDate: Mon May 11 16:21:41 2020 +0200 Disable keylog callback support for LibreSSL LibreSSL (as of 3.1.1) does not provide SSL_CTX_set_keylog_callback(). Don't define HAVE_KEYLOG_CALLBACK in this case. --- native/include/ssl_private.h | 2 +- xdocs/miscellaneous/changelog.xml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/native/include/ssl_private.h b/native/include/ssl_private.h index d88e393..26495e4 100644 --- a/native/include/ssl_private.h +++ b/native/include/ssl_private.h @@ -241,7 +241,7 @@ #define TLS_server_method SSLv23_server_method #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */ -#if OPENSSL_VERSION_NUMBER >= 0x10101000L +#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER) #define HAVE_KEYLOG_CALLBACK #endif diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml index 164437f..71cfd86 100644 --- a/xdocs/miscellaneous/changelog.xml +++ b/xdocs/miscellaneous/changelog.xml @@ -42,6 +42,9 @@ <update> Improve OS-specific header include for native thread id. (michaelo) </update> + <fix> + Disable keylog callback support for LibreSSL. (michaelo) + </fix> </changelog> </section> <section name="Changes in 1.2.24"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org