Attachment 214393 Details for Bug 246373 – Second patch

[patch] Second patch

0002-Disable-keylog-callback-support-for-LibreSSL.patch (text/plain), 2.04 KB, created by Michael Osipov on 2020-05-11 19:54:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Osipov

Created: 2020-05-11 19:54:10 UTC

Size: 2.04 KB

patch

obsolete

>From 905bf097ce7513d9f057e3d5c3ba2cbcc52b6732 Mon Sep 17 00:00:00 2001
>From: Michael Osipov <michaelo@apache.org>
>Date: Mon, 11 May 2020 16:21:41 +0200
>Subject: [PATCH 2/2] 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 | 16 +++++++++++++++-
> 2 files changed, 16 insertions(+), 2 deletions(-)
>
>diff --git a/native/include/ssl_private.h b/native/include/ssl_private.h
>index d88e393d..26495e46 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 637975c6..71cfd86f 100644
>--- a/xdocs/miscellaneous/changelog.xml
>+++ b/xdocs/miscellaneous/changelog.xml
>@@ -34,6 +34,19 @@
>   This is the Changelog for Tomcat Native 1.2.
>   </p>
> </section>
>+<section name="Changes in 1.2.25">
>+  <changelog>
>+    <fix>
>+      Incomplete name mangling fix for C++ compilers in tcn_api.h. (michaelo)
>+    </fix>
>+    <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">
>   <changelog>
>     <fix>
>@@ -62,7 +75,8 @@
>       OpenSSL 1.1.0 onwards. (mturk)
>     </update>
>     <add>
>-      Introduce tcn_get_thread_id(void) to reduce code duplication. (michaelo)
>+      <bug>64316</bug>: Introduce tcn_get_thread_id(void) to reduce code
>+	  duplication. (michaelo)
>     </add>
>     <fix>
>       Fix linking against OpenSSL in non-standard locations on FreeBSD.
>-- 
>2.26.2
>

Actions: View | Diff

Attachments on bug 246373: 214392 | 214393