commit 14e3712b8c39165219fa227bd11f6feae7b09a33
Author: Eneas U de Queiroz <email address hidden>
Date: Mon Apr 22 11:03:25 2019 -0300
* src/openssl.c: fix ssl_init for openssl 1.1.1
ssl_init fails with openssl 1.1.1 when openssl.cnf is not found.
Redundant calls to intialization functions were removed as
OPENSSL_config takes care of them for openssl versions < 1.1.0.
For versions > 1.1.0, OPENSSL_init_ssl is preferred.
Signed-off-by: Eneas U de Queiroz <email address hidden>
Copyright-paperwork-exempt: Yes
In wget, this was fixed upstream in
commit 14e3712b8c39165 219fa227bd11f6f eae7b09a33
Author: Eneas U de Queiroz <email address hidden>
Date: Mon Apr 22 11:03:25 2019 -0300
* src/openssl.c: fix ssl_init for openssl 1.1.1
ssl_init fails with openssl 1.1.1 when openssl.cnf is not found.
Redundant calls to intialization functions were removed as
OPENSSL_config takes care of them for openssl versions < 1.1.0.
For versions > 1.1.0, OPENSSL_init_ssl is preferred.
Signed-off-by: Eneas U de Queiroz <email address hidden> paperwork- exempt: Yes
Copyright-
diff --git a/src/openssl.c b/src/openssl.c VERSION_ NUMBER >= 0x00907000 initialized == 0) LIBRESSL_ VERSION_ NUMBER) && (OPENSSL_ VERSION_ NUMBER >= 0x10100000L) INIT_LOAD_ CONFIG | OPENSSL_ INIT_ENGINE_ ALL_BUILTIN, NULL);
OPENSSL_ config (NULL);
ssl_true_ initialized = 1;
index a1502173..03737d7a 100644
--- a/src/openssl.c
+++ b/src/openssl.c
@@ -174,7 +174,9 @@ ssl_init (void)
#if OPENSSL_
if (ssl_true_
{
-#if OPENSSL_API_COMPAT < 0x10100000L
+#if !defined(
+ OPENSSL_init_ssl (OPENSSL_
+#else
#endif
@@ -194,21 +196,9 @@ ssl_init (void)
goto error;
}
-#if OPENSSL_ VERSION_ NUMBER >= 0x00907000 load_builtin_ modules( ); load_builtin_ engines( ); load_file( NULL, NULL, DEFAULT_ SECTION| CONF_MFLAGS_ IGNORE_ MISSING_ FILE); LIBRESSL_ VERSION_ NUMBER) || (OPENSSL_ VERSION_ NUMBER < 0x10100000L) load_error_ strings (); VERSION_ NUMBER < 0x10100000L add_all_ algorithms (); add_ssl_ algorithms ();
- OPENSSL_
-#ifndef OPENSSL_NO_ENGINE
- ENGINE_
-#endif
- CONF_modules_
- CONF_MFLAGS_
-#endif
-#if OPENSSL_API_COMPAT >= 0x10100000L
- OPENSSL_init_ssl(0, NULL);
-#else
+#if defined(
SSL_library_init ();
SSL_
-#endif
-#if OPENSSL_
SSLeay_
SSLeay_
#endif