From 00fa1e4108db4b41dae76909ae5adcdf837ba6ef Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sat, 20 Jan 2018 14:26:06 +0800 Subject: [PATCH] curl: fix libcurl/mbedtls async interface When using mbedtls, curl's nonblocking interface will report a request as done immediately after the socket is written to and never read from the connection. This will result in a HTTP status code of 0 and zero length replies. Cherry-pick the patch from curl 7.53.0 to fix this (https://github.com/curl/curl/commit/b993d2cc). Fixes https://bugs.openwrt.org/index.php?do=details&task_id=1285. Signed-off-by: Darren Tucker --- package/network/utils/curl/Makefile | 2 +- .../320-mbedtls-nonblocking-handshake.patch | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 package/network/utils/curl/patches/320-mbedtls-nonblocking-handshake.patch diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile index 5d829547aa..56bf503c64 100644 --- a/package/network/utils/curl/Makefile +++ b/package/network/utils/curl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=curl PKG_VERSION:=7.52.1 -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://curl.haxx.se/download/ \ diff --git a/package/network/utils/curl/patches/320-mbedtls-nonblocking-handshake.patch b/package/network/utils/curl/patches/320-mbedtls-nonblocking-handshake.patch new file mode 100644 index 0000000000..33ab296e56 --- /dev/null +++ b/package/network/utils/curl/patches/320-mbedtls-nonblocking-handshake.patch @@ -0,0 +1,27 @@ +From b993d2cca536870ecdf3b4611de9f77215af8eb8 Mon Sep 17 00:00:00 2001 +From: Antoine Aubert +Date: Fri, 20 Jan 2017 08:10:28 +0100 +Subject: [PATCH] vtls: fix mbedtls multi non blocking handshake. + +When using multi, mbedtls handshake is in non blocking mode. +vtls must set wait for read/write flags for the socket. +--- + lib/vtls/vtls.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c +index fad9335bbf..871622fef1 100644 +--- a/lib/vtls/vtls.c ++++ b/lib/vtls/vtls.c +@@ -485,8 +485,9 @@ void Curl_ssl_close_all(struct Curl_easy *data) + } + + #if defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \ +- defined(USE_DARWINSSL) || defined(USE_NSS) +-/* This function is for OpenSSL, GnuTLS, darwinssl, and schannel only. */ ++ defined(USE_DARWINSSL) || defined(USE_NSS) || defined(USE_MBEDTLS) ++/* This function is for OpenSSL, GnuTLS, darwinssl, mbedtls, and schannel ++ only. */ + int Curl_ssl_getsock(struct connectdata *conn, curl_socket_t *socks, + int numsocks) + { -- 2.30.2