curl/curl-use_OPENSSL_config.patch
Tomáš Chvátal ddfab0d7ec Accepting request 716040 from home:pmonrealgonzalez:branches:devel:libraries:c_c++
- Update to 7.65.2
  * Bugfixes:
    - CIPHERS.md: Explain Schannel error SEC_E_ALGORITHM_MISMATCH
    - CMake: Fix finding Brotli on case-sensitive file systems
    - CURLOPT_RANGE.3: Caution against using it for HTTP PUT
    - CURLOPT_SEEKDATA.3: fix variable name
    - bindlocal: detect and avoid IP version mismatches in bind()
    - build: fix Codacy warnings
    - c-ares: honor port numbers in CURLOPT_DNS_SERVERS
    - config-os400: add getpeername and getsockname defines
    - configure: --disable-progress-meter
    - configure: fix --disable-code-coverage
    - configure: more --disable switches to toggle off individual features
    - configure: remove CURL_DISABLE_TLS_SRP
    - conn_maxage: move the check to prune_dead_connections()
    - curl: skip CURLOPT_PROXY_CAPATH for disabled-proxy builds
    - docs: Explain behavior change in --tlsv1. options since 7.54
    - docs: Fix links to OpenSSL docs
    - docs: fix string suggesting HTTP/2 is not the default
    - headers: Remove no longer exported functions
    - http2: call done_sending on end of upload
    - http2: don't call stream-close on already closed streams
    - http2: remove CURL_DISABLE_TYPECHECK define
    - http: allow overriding timecond with custom header
    - http: clarify header buffer size calculation
    - krb5: fix compiler warning
    - lib: Use UTF-8 encoding in comments
    - libcurl: Restrict redirect schemes to HTTP, HTTPS, FTP and FTPS
    - multi: enable multiplexing by default (again)
    - multi: fix the transfer hashes in the socket hash entries

OBS-URL: https://build.opensuse.org/request/show/716040
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=257
2019-07-17 11:56:03 +00:00

33 lines
1.1 KiB
Diff

This basically reverts https://github.com/curl/curl/commit/7d2f61f66ab4e047fc9aefc2effc1ac6d340a66a
Index: curl-7.65.2/lib/vtls/openssl.c
===================================================================
--- 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)
ENGINE_load_builtin_engines();
#endif
-/* CONF_MFLAGS_DEFAULT_SECTION was introduced some time between 0.9.8b and
- 0.9.8e */
-#ifndef CONF_MFLAGS_DEFAULT_SECTION
-#define CONF_MFLAGS_DEFAULT_SECTION 0x0
-#endif
-
-#ifndef CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG
- CONF_modules_load_file(NULL, NULL,
- CONF_MFLAGS_DEFAULT_SECTION|
- CONF_MFLAGS_IGNORE_MISSING_FILE);
-#endif
-
#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();