2018-05-18 13:17:37 +00:00
|
|
|
This basically reverts https://github.com/curl/curl/commit/7d2f61f66ab4e047fc9aefc2effc1ac6d340a66a
|
|
|
|
|
2019-07-17 11:56:03 +00:00
|
|
|
Index: curl-7.65.2/lib/vtls/openssl.c
|
2018-10-31 11:23:21 +00:00
|
|
|
===================================================================
|
2019-07-17 11:56:03 +00:00
|
|
|
--- curl-7.65.2.orig/lib/vtls/openssl.c
|
|
|
|
+++ curl-7.65.2/lib/vtls/openssl.c
|
|
|
|
@@ -1026,22 +1026,12 @@ static int Curl_ossl_init(void)
|
2018-05-18 13:17:37 +00:00
|
|
|
ENGINE_load_builtin_engines();
|
|
|
|
#endif
|
|
|
|
|
2019-07-17 11:56:03 +00:00
|
|
|
-/* CONF_MFLAGS_DEFAULT_SECTION was introduced some time between 0.9.8b and
|
|
|
|
- 0.9.8e */
|
2018-05-18 13:17:37 +00:00
|
|
|
-#ifndef CONF_MFLAGS_DEFAULT_SECTION
|
|
|
|
-#define CONF_MFLAGS_DEFAULT_SECTION 0x0
|
|
|
|
-#endif
|
|
|
|
-
|
2018-10-31 11:23:21 +00:00
|
|
|
-#ifndef CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG
|
2018-05-18 13:17:37 +00:00
|
|
|
- CONF_modules_load_file(NULL, NULL,
|
|
|
|
- CONF_MFLAGS_DEFAULT_SECTION|
|
|
|
|
- CONF_MFLAGS_IGNORE_MISSING_FILE);
|
2018-10-31 11:23:21 +00:00
|
|
|
-#endif
|
2018-05-18 13:17:37 +00:00
|
|
|
-
|
|
|
|
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
|
|
|
|
!defined(LIBRESSL_VERSION_NUMBER)
|
|
|
|
- /* OpenSSL 1.1.0+ takes care of initialization itself */
|
|
|
|
+ OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL);
|
|
|
|
#else
|
|
|
|
+ OPENSSL_config(NULL);
|
|
|
|
+
|
|
|
|
/* Lets get nice error messages */
|
|
|
|
SSL_load_error_strings();
|
|
|
|
|