[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 394/411: openssl: use OPENSSL_init_ssl() with >= 1.1.0
From: |
gnunet |
Subject: |
[gnurl] 394/411: openssl: use OPENSSL_init_ssl() with >= 1.1.0 |
Date: |
Wed, 13 Jan 2021 01:23:29 +0100 |
This is an automated email from the git hooks/post-receive script.
nikita pushed a commit to branch master
in repository gnurl.
commit 1835cb916e0d40eb8bc1165d5627a0b64f911bac
Author: Daniel Stenberg <daniel@haxx.se>
AuthorDate: Sat Nov 28 16:42:52 2020 +0100
openssl: use OPENSSL_init_ssl() with >= 1.1.0
Reported-by: Kovalkov Dmitrii and Per Nilsson
Fixes #6254
Fixes #6256
Closes #6260
---
lib/vtls/openssl.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 04bf0c15a..c905465a0 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -1115,6 +1115,21 @@ static int x509_name_oneline(X509_NAME *a, char *buf,
size_t size)
*/
static int Curl_ossl_init(void)
{
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
+ !defined(LIBRESSL_VERSION_NUMBER)
+ const uint64_t flags =
+#ifdef OPENSSL_INIT_ENGINE_ALL_BUILTIN
+ /* not present in BoringSSL */
+ OPENSSL_INIT_ENGINE_ALL_BUILTIN |
+#endif
+#ifdef CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG
+ OPENSSL_INIT_NO_LOAD_CONFIG |
+#else
+ OPENSSL_INIT_LOAD_CONFIG |
+#endif
+ 0;
+ OPENSSL_init_ssl(flags, NULL);
+#else
OPENSSL_load_builtin_modules();
#ifdef USE_OPENSSL_ENGINE
@@ -1133,10 +1148,6 @@ static int Curl_ossl_init(void)
CONF_MFLAGS_IGNORE_MISSING_FILE);
#endif
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
- !defined(LIBRESSL_VERSION_NUMBER)
- /* OpenSSL 1.1.0+ takes care of initialization itself */
-#else
/* Lets get nice error messages */
SSL_load_error_strings();
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnurl] 305/411: rtsp: fixed the RTST Session ID mismatch in test 570, (continued)
- [gnurl] 305/411: rtsp: fixed the RTST Session ID mismatch in test 570, gnunet, 2021/01/12
- [gnurl] 371/411: infof/failf calls: fix format specifiers, gnunet, 2021/01/12
- [gnurl] 339/411: curl: only warn not fail, if not finding the home dir, gnunet, 2021/01/12
- [gnurl] 319/411: tool_operate: set HSTS with CURLOPT_HSTS to pass on filename, gnunet, 2021/01/12
- [gnurl] 272/411: alt-svc: enable by default, gnunet, 2021/01/12
- [gnurl] 391/411: docs: fix typos and markup in ETag manpage sections, gnunet, 2021/01/12
- [gnurl] 334/411: curl_easy_escape: limit output string length to 3 * max input, gnunet, 2021/01/12
- [gnurl] 384/411: openssl: remove #if 0 leftover, gnunet, 2021/01/12
- [gnurl] 403/411: cmake: don't use reserved target name 'test', gnunet, 2021/01/12
- [gnurl] 382/411: RELEASE-NOTES: synced, gnunet, 2021/01/12
- [gnurl] 394/411: openssl: use OPENSSL_init_ssl() with >= 1.1.0,
gnunet <=
- [gnurl] 380/411: ngtcp2: use the minimal version of QUIC supported by ngtcp2, gnunet, 2021/01/12
- [gnurl] 409/411: gnurl: rename new files, gnunet, 2021/01/12
- [gnurl] 379/411: ngtcp2: advertise h3 ALPN unconditionally, gnunet, 2021/01/12
- [gnurl] 386/411: splay: rename Curl_splayremovebyaddr to Curl_splayremove, gnunet, 2021/01/12
- [gnurl] 392/411: tests/util.py: fix compatibility with Python 2, gnunet, 2021/01/12
- [gnurl] 399/411: urlapi: don't accept blank port number field without scheme, gnunet, 2021/01/12
- [gnurl] 410/411: adjust makefile for opts, gnunet, 2021/01/12
- [gnurl] 366/411: urldata: remove 'void *protop' and create the union 'p', gnunet, 2021/01/12
- [gnurl] 344/411: cirrus: build with FreeBSD 12.2 in CirrusCI, gnunet, 2021/01/12
- [gnurl] 313/411: copyright: fix year ranges, gnunet, 2021/01/12