From: Richard Levitte <levitte@openssl.org>
Date: Sat, 25 Nov 2017 11:08:47 +0000 (+0100)
Subject: In apps_startup(), call OPENSSL_init_ssl() rather than OPENSSL_init_crypto()
X-Git-Tag: OpenSSL_1_1_1-pre1~341
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0488c0bbbe87eee3a800797b91350c653e9f1711;p=oweals%2Fopenssl.git

In apps_startup(), call OPENSSL_init_ssl() rather than OPENSSL_init_crypto()

Otherwise, any command that relies on ssl modules may fail, because
SSL_add_ssl_module() will be called after the config file has already
been loaded.

Fixes #4788

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4792)
---

diff --git a/apps/openssl.c b/apps/openssl.c
index 1c8682759f..2cb49cbb35 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -80,8 +80,8 @@ static int apps_startup()
 #endif
 
     /* Set non-default library initialisation settings */
-    if (!OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN
-                             | OPENSSL_INIT_LOAD_CONFIG, NULL))
+    if (!OPENSSL_init_ssl(OPENSSL_INIT_ENGINE_ALL_BUILTIN
+                          | OPENSSL_INIT_LOAD_CONFIG, NULL))
         return 0;
 
     setup_ui_method();