mbedtls: update to version 2.4.2
[openwrt/openwrt.git] / package / network / utils / curl / patches / 001-curl-https-openssl-fix.patch
1 From a7b38c9dc98481e4a5fc37e51a8690337c674dfb Mon Sep 17 00:00:00 2001
2 From: Daniel Stenberg <daniel@haxx.se>
3 Date: Mon, 26 Dec 2016 00:06:33 +0100
4 Subject: [PATCH] vtls: s/SSLEAY/OPENSSL
5
6 Fixed an old leftover use of the USE_SSLEAY define which would make a
7 socket get removed from the applications sockets to monitor when the
8 multi_socket API was used, leading to timeouts.
9
10 Bug: #1174
11 ---
12 lib/vtls/vtls.c | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15 diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
16 index b808e1c..707f24b 100644
17 --- a/lib/vtls/vtls.c
18 +++ b/lib/vtls/vtls.c
19 @@ -484,7 +484,7 @@ void Curl_ssl_close_all(struct Curl_easy *data)
20 curlssl_close_all(data);
21 }
22
23 -#if defined(USE_SSLEAY) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
24 +#if defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
25 defined(USE_DARWINSSL) || defined(USE_NSS)
26 /* This function is for OpenSSL, GnuTLS, darwinssl, and schannel only. */
27 int Curl_ssl_getsock(struct connectdata *conn, curl_socket_t *socks,
28 @@ -518,7 +518,7 @@ int Curl_ssl_getsock(struct connectdata *conn,
29 (void)numsocks;
30 return GETSOCK_BLANK;
31 }
32 -/* USE_SSLEAY || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
33 +/* USE_OPENSSL || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
34 #endif
35
36 void Curl_ssl_close(struct connectdata *conn, int sockindex)