summaryrefslogtreecommitdiffstats
path: root/package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-07-03 23:21:01 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2015-07-03 23:21:01 +0000
commit97b14fd70037aa1d10bbd0b2ed67efd82e160c56 (patch)
tree68db5d8a98993614e1b6ee5c853c624fd330db09 /package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch
parent69a2459c668e9ddf129bbff94633a621e21aeca8 (diff)
downloadmaster-31e0f0ae-97b14fd70037aa1d10bbd0b2ed67efd82e160c56.tar.gz
master-31e0f0ae-97b14fd70037aa1d10bbd0b2ed67efd82e160c56.tar.bz2
master-31e0f0ae-97b14fd70037aa1d10bbd0b2ed67efd82e160c56.zip
curl: update curl to version 7.43.0
This brings curl to version 7.43.0 and contains fixes for the following security vulnerabilities: CVE-2015-3236: lingering HTTP credentials in connection re-use http://curl.haxx.se/docs/adv_20150617A.html CVE-2015-3237: SMB send off unrelated memory contents http://curl.haxx.se/docs/adv_20150617B.html The 100-check_long_long patch is not needed any more, because the upstream autoconf script already checks for long long when cyassl is selected. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 46169
Diffstat (limited to 'package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch')
-rw-r--r--package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch8
1 files changed, 4 insertions, 4 deletions
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 d008227509..1b5b63aa69 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,11 +1,11 @@
--- a/lib/vtls/polarssl.c
+++ b/lib/vtls/polarssl.c
-@@ -591,7 +591,7 @@ void Curl_polarssl_session_free(void *pt
+@@ -592,7 +592,7 @@ void Curl_polarssl_session_free(void *pt
size_t Curl_polarssl_version(char *buffer, size_t size)
{
- unsigned int version = version_get_number();
+ unsigned int version = POLARSSL_VERSION_NUMBER;
- return snprintf(buffer, size, "PolarSSL/%d.%d.%d", version>>24,
- (version>>16)&0xff, (version>>8)&0xff);
- }
+ return snprintf(buffer, size, "%s/%d.%d.%d",
+ version >= 0x01030A00?"mbedTLS":"PolarSSL",
+ version>>24, (version>>16)&0xff, (version>>8)&0xff);