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_0h~174
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea4e868a3c6872f4944dd5469518f8b10ee3432c;p=openssl

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)

(cherry picked from commit 0488c0bbbe87eee3a800797b91350c653e9f1711)
---

diff --git a/apps/openssl.c b/apps/openssl.c
index b99bfa8d48..6e7b02c64d 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -69,8 +69,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;
 
 #ifndef OPENSSL_NO_UI