diff options
author | Maxin B. John <maxin.john@intel.com> | 2016-08-22 11:39:32 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-02 08:48:35 +0100 |
commit | 72ea3c272ccddcde88c47d4aaea128384f412c74 (patch) | |
tree | 3db923437961e785d74a26c1b00ad27ee8af97cc | |
parent | 0e0c04343d1fd6bb8a05ede4c33f2636921a0ec3 (diff) | |
download | poky-72ea3c272ccddcde88c47d4aaea128384f412c74.tar.gz |
curl: security fix for CVE-2016-5420
Affected versions: libcurl 7.1 to and including 7.50.0
(From OE-Core rev: 6b732a392289a7bb50b0e3716c066c62fa32a14d)
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/curl/curl/CVE-2016-5420.patch | 31 | ||||
-rw-r--r-- | meta/recipes-support/curl/curl_7.44.0.bb | 1 |
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 @@ | |||
1 | From 11ec5ad4352bba384404c56e77c7fab9382fd22d Mon Sep 17 00:00:00 2001 | ||
2 | From: Daniel Stenberg <daniel@haxx.se> | ||
3 | Date: Sun, 31 Jul 2016 00:51:48 +0200 | ||
4 | Subject: [PATCH] TLS: only reuse connections with the same client cert | ||
5 | |||
6 | Bug: https://curl.haxx.se/docs/adv_20160803B.html | ||
7 | |||
8 | Upstream-Status: Backport | ||
9 | https://curl.haxx.se/CVE-2016-5420.patch | ||
10 | |||
11 | CVE: CVE-2016-5420 | ||
12 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
13 | --- | ||
14 | lib/vtls/vtls.c | 1 + | ||
15 | 1 file changed, 1 insertion(+) | ||
16 | |||
17 | diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c | ||
18 | index 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 | -- | ||
30 | 2.4.0 | ||
31 | |||
diff --git a/meta/recipes-support/curl/curl_7.44.0.bb b/meta/recipes-support/curl/curl_7.44.0.bb index dcd63aa938..917bd2742f 100644 --- a/meta/recipes-support/curl/curl_7.44.0.bb +++ b/meta/recipes-support/curl/curl_7.44.0.bb | |||
@@ -13,6 +13,7 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ | |||
13 | # from mucking around with debug options | 13 | # from mucking around with debug options |
14 | # | 14 | # |
15 | SRC_URI += " file://configure_ac.patch \ | 15 | SRC_URI += " file://configure_ac.patch \ |
16 | file://CVE-2016-5420.patch \ | ||
16 | file://CVE-2016-5419.patch \ | 17 | file://CVE-2016-5419.patch \ |
17 | file://CVE-2016-0754.patch \ | 18 | file://CVE-2016-0754.patch \ |
18 | file://CVE-2016-0755.patch" | 19 | file://CVE-2016-0755.patch" |