summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/curl/curl/CVE-2016-5420.patch31
-rw-r--r--meta/recipes-support/curl/curl_7.47.1.bb1
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-support/curl/curl/CVE-2016-5420.patch b/meta/recipes-support/curl/curl/CVE-2016-5420.patch
new file mode 100644
index 0000000000..6bfacd7c9d
--- /dev/null
+++ b/meta/recipes-support/curl/curl/CVE-2016-5420.patch
@@ -0,0 +1,31 @@
1From 11ec5ad4352bba384404c56e77c7fab9382fd22d Mon Sep 17 00:00:00 2001
2From: Daniel Stenberg <daniel@haxx.se>
3Date: Sun, 31 Jul 2016 00:51:48 +0200
4Subject: [PATCH] TLS: only reuse connections with the same client cert
5
6Bug: https://curl.haxx.se/docs/adv_20160803B.html
7
8Upstream-Status: Backport
9https://curl.haxx.se/CVE-2016-5420.patch
10
11CVE: CVE-2016-5420
12Signed-off-by: Maxin B. John <maxin.john@intel.com>
13---
14 lib/vtls/vtls.c | 1 +
15 1 file changed, 1 insertion(+)
16
17diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
18index 33e209d..3863777 100644
19--- a/lib/vtls/vtls.c
20+++ b/lib/vtls/vtls.c
21@@ -99,6 +99,7 @@ Curl_ssl_config_matches(struct ssl_config_data* data,
22 (data->verifyhost == needle->verifyhost) &&
23 safe_strequal(data->CApath, needle->CApath) &&
24 safe_strequal(data->CAfile, needle->CAfile) &&
25+ safe_strequal(data->clientcert, needle->clientcert) &&
26 safe_strequal(data->random_file, needle->random_file) &&
27 safe_strequal(data->egdsocket, needle->egdsocket) &&
28 safe_strequal(data->cipher_list, needle->cipher_list))
29--
302.4.0
31
diff --git a/meta/recipes-support/curl/curl_7.47.1.bb b/meta/recipes-support/curl/curl_7.47.1.bb
index 945840b1a9..8d459c75d6 100644
--- a/meta/recipes-support/curl/curl_7.47.1.bb
+++ b/meta/recipes-support/curl/curl_7.47.1.bb
@@ -12,6 +12,7 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2"
12# 12#
13SRC_URI += " file://configure_ac.patch \ 13SRC_URI += " file://configure_ac.patch \
14 file://CVE-2016-5419.patch \ 14 file://CVE-2016-5419.patch \
15 file://CVE-2016-5420.patch \
15 " 16 "
16 17
17SRC_URI[md5sum] = "9ea3123449439bbd960cd25cf98796fb" 18SRC_URI[md5sum] = "9ea3123449439bbd960cd25cf98796fb"