Attachment 214392 Details for Bug 246373 – First patch

[patch] First patch

0001-Revert-Use-new-OpenSSL-v1.1-initialization-API.patch (text/plain), 2.11 KB, created by Michael Osipov on 2020-05-11 19:53:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Osipov

Created: 2020-05-11 19:53:45 UTC

Size: 2.11 KB

patch

obsolete

>From ecc7e43320e023f160d8c20a0a1752a1537b2a7a Mon Sep 17 00:00:00 2001
>From: Michael Osipov <michaelo@apache.org>
>Date: Mon, 11 May 2020 21:03:08 +0200
>Subject: [PATCH 1/2] Revert "Use new OpenSSL v1.1+ initialization API"
>
>This reverts commit b8649e81458194d70667952d9e26df82a79c773f.
>---
> native/src/ssl.c | 16 ++--------------
> 1 file changed, 2 insertions(+), 14 deletions(-)
>
>diff --git a/native/src/ssl.c b/native/src/ssl.c
>index 98d77ebe..fcb2a9ec 100644
>--- a/native/src/ssl.c
>+++ b/native/src/ssl.c
>@@ -367,11 +367,6 @@ static apr_status_t ssl_init_cleanup(void *data)
> #endif
>     free_dh_params();
> 
>-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
>-    /* Openssl v1.1+ handles all termination automatically. Do
>-     * nothing in this case.
>-     */
>-#else
>     /*
>      * Try to kill the internals of the SSL library.
>      */
>@@ -394,7 +389,6 @@ static apr_status_t ssl_init_cleanup(void *data)
> #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
>     ERR_remove_thread_state(NULL);
> #endif
>-#endif
> 
> #ifdef HAVE_KEYLOG_CALLBACK
>     if (key_log_file) {
>@@ -764,14 +758,7 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS, jstring engine)
>         TCN_FREE_CSTRING(engine);
>         return (jint)APR_SUCCESS;
>     }
>-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
>-    /* Openssl v1.1+ handles all initialisation automatically, apart
>-     * from hints as to how we want to use the library.
>-     *
>-     * We tell openssl we want to include engine support.
>-     */
>-    OPENSSL_init_ssl(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL);
>-#else
>+
>     /* We must register the library in full, to ensure our configuration
>      * code can successfully test the SSL environment.
>      */
>@@ -785,6 +772,7 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS, jstring engine)
> #endif
>     OPENSSL_load_builtin_modules();
> 
>+#if OPENSSL_VERSION_NUMBER < 0x10100000L
> #if ! (defined(WIN32) || defined(WIN64))
>     err = apr_threadkey_private_create(&thread_exit_key, _ssl_thread_exit,
>                                        tcn_global_pool);
>-- 
>2.26.2
>

Actions: View | Diff

Attachments on bug 246373: 214392 | 214393