diff options
| author | Dirk Neukirchen <dirkneukirchen@web.de> | 2016-05-19 13:27:41 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-05-19 16:56:34 +0200 |
| commit | 6aebc6b16b3e2e7058b8b5ab1ffa7f65920541ff (patch) | |
| tree | 62bc4cfbb2ff827b145b856189aba40ff81e28f5 /package/network/utils/curl/patches | |
| parent | 9d37095fd055a2c11b4d62978fe22b2e6f8e2c32 (diff) | |
| download | mtk-20170518-6aebc6b16b3e2e7058b8b5ab1ffa7f65920541ff.zip mtk-20170518-6aebc6b16b3e2e7058b8b5ab1ffa7f65920541ff.tar.gz mtk-20170518-6aebc6b16b3e2e7058b8b5ab1ffa7f65920541ff.tar.bz2 | |
curl: update to 7.49
fixes:
CVE-2016-3739: TLS certificate check bypass with mbedTLS/PolarSSL
- remove crypto auth compile fix
curl changelog of 7.46 states its fixed
- fix mbedtls and cyassl usability #19621 :
add path to certificate file (from Mozilla via curl) and
provide this in a new package
tested on ar71xx w. curl/mbedtls/wolfssl
Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>
Diffstat (limited to 'package/network/utils/curl/patches')
3 files changed, 7 insertions, 32 deletions
diff --git a/package/network/utils/curl/patches/200-no_docs_tests.patch b/package/network/utils/curl/patches/200-no_docs_tests.patch index 4ac5bad..6f86d4c 100644 --- a/package/network/utils/curl/patches/200-no_docs_tests.patch +++ b/package/network/utils/curl/patches/200-no_docs_tests.patch @@ -3,8 +3,8 @@ @@ -150,7 +150,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) bin_SCRIPTS = curl-config - SUBDIRS = lib src include scripts --DIST_SUBDIRS = $(SUBDIRS) tests packages docs + SUBDIRS = lib src include +-DIST_SUBDIRS = $(SUBDIRS) tests packages docs scripts +DIST_SUBDIRS = $(SUBDIRS) packages pkgconfigdir = $(libdir)/pkgconfig @@ -14,9 +14,9 @@ @@ -611,7 +611,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) bin_SCRIPTS = curl-config - SUBDIRS = lib src include scripts --DIST_SUBDIRS = $(SUBDIRS) tests packages docs + SUBDIRS = lib src include +-DIST_SUBDIRS = $(SUBDIRS) tests packages docs scripts +DIST_SUBDIRS = $(SUBDIRS) packages pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libcurl.pc - LIB_VTLS_CFILES = vtls/openssl.c vtls/gtls.c vtls/vtls.c vtls/nss.c \ + LIB_VAUTH_CFILES = vauth/vauth.c vauth/cleartext.c vauth/cram.c \ diff --git a/package/network/utils/curl/patches/300-fix-disable-crypto-auth.patch b/package/network/utils/curl/patches/300-fix-disable-crypto-auth.patch deleted file mode 100644 index 5c0a37e..0000000 --- a/package/network/utils/curl/patches/300-fix-disable-crypto-auth.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/lib/curl_ntlm_msgs.c -+++ b/lib/curl_ntlm_msgs.c -@@ -573,7 +573,7 @@ CURLcode Curl_sasl_create_ntlm_type3_mes - else - #endif - --#if USE_NTRESPONSES && USE_NTLM2SESSION -+#if USE_NTRESPONSES && USE_NTLM2SESSION && !defined(CURL_DISABLE_CRYPTO_AUTH) - /* We don't support NTLM2 if we don't have USE_NTRESPONSES */ - if(ntlm->flags & NTLMFLAG_NEGOTIATE_NTLM2_KEY) { - unsigned char ntbuffer[0x18]; ---- a/lib/vtls/vtls.c -+++ b/lib/vtls/vtls.c -@@ -921,9 +921,9 @@ CURLcode Curl_ssl_md5sum(unsigned char * - unsigned char *md5sum, /* output */ - size_t md5len) - { --#ifdef curlssl_md5sum -+#if defined(curlssl_md5sum) - curlssl_md5sum(tmp, tmplen, md5sum, md5len); --#else -+#elif !defined(CURL_DISABLE_CRYPTO_AUTH) - MD5_context *MD5pw; - - (void) md5len; diff --git a/package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch b/package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch index 7f7937b..bb622ee 100644 --- a/package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch +++ b/package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch @@ -1,6 +1,6 @@ --- a/lib/vtls/polarssl.c +++ b/lib/vtls/polarssl.c -@@ -592,7 +592,7 @@ void Curl_polarssl_session_free(void *pt +@@ -653,7 +653,7 @@ void Curl_polarssl_session_free(void *pt size_t Curl_polarssl_version(char *buffer, size_t size) { @@ -11,7 +11,7 @@ version>>24, (version>>16)&0xff, (version>>8)&0xff); --- a/lib/vtls/mbedtls.c +++ b/lib/vtls/mbedtls.c -@@ -712,7 +712,7 @@ void Curl_mbedtls_session_free(void *ptr +@@ -701,7 +701,7 @@ void Curl_mbedtls_session_free(void *ptr size_t Curl_mbedtls_version(char *buffer, size_t size) { |