summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/curl/curl/CVE-2016-7141.patch
diff options
context:
space:
mode:
authorSona Sarmadi <sona.sarmadi@enea.com>2017-04-21 12:29:17 +0200
committerAdrian Dudau <adrian.dudau@enea.com>2017-04-21 13:54:14 +0200
commit3fc5d271f554e07c88b1195812e48a0d86291395 (patch)
treeaa886d608aee07639e7a841d0618ccd0bda97bc7 /meta/recipes-support/curl/curl/CVE-2016-7141.patch
parent9ee38b3a027470c98f7337dceac67ba06420c075 (diff)
downloadpoky-3fc5d271f554e07c88b1195812e48a0d86291395.tar.gz
curl: Upgrade 7.47.1 -> 7.53.1
Security vulnerabilities fixed between 7.47.1 and 7.53.1 versions: ================================================================= TLS session resumption client cert bypass (again): CVE-2017-XXXX --write-out out of buffer read: CVE-2017-7407 SSL_VERIFYSTATUS ignored: CVE-2017-2629 uninitialized random: CVE-2016-9594 printf floating point buffer overflow: CVE-2016-9586 Win CE schannel cert wildcard matches too much: CVE-2016-9952 Win CE schannel cert name out of buffer read: CVE-2016-9953 cookie injection for other servers: CVE-2016-8615 case insensitive password comparison: CVE-2016-8616 OOB write via unchecked multiplication: CVE-2016-8617 double-free in curl_maprintf: CVE-2016-8618 double-free in krb5 code: CVE-2016-8619 glob parser write/read out of bounds: CVE-2016-8620 curl_getdate read out of bounds: CVE-2016-8621 URL unescape heap overflow via integer truncation: CVE-2016-8622 Use-after-free via shared cookies: CVE-2016-8623 invalid URL parsing with '#': CVE-2016-8624 IDNA 2003 makes curl use wrong host: CVE-2016-8625 curl escape and unescape integer overflows: CVE-2016-7167 Incorrect reuse of client certificates: CVE-2016-7141 TLS session resumption client cert bypass: CVE-2016-5419 Re-using connections with wrong client cert: CVE-2016-5420 use of connection struct after free: CVE-2016-5421 Windows DLL hijacking: CVE-2016-4802 TLS certificate check bypass with mbedTLS/PolarSSL: CVE-2016-3739 Reference: https://curl.haxx.se/docs/security.html https://curl.haxx.se/changes.html Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Diffstat (limited to 'meta/recipes-support/curl/curl/CVE-2016-7141.patch')
-rw-r--r--meta/recipes-support/curl/curl/CVE-2016-7141.patch50
1 files changed, 0 insertions, 50 deletions
diff --git a/meta/recipes-support/curl/curl/CVE-2016-7141.patch b/meta/recipes-support/curl/curl/CVE-2016-7141.patch
deleted file mode 100644
index eb03afddf8..0000000000
--- a/meta/recipes-support/curl/curl/CVE-2016-7141.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From 7700fcba64bf5806de28f6c1c7da3b4f0b38567d Mon Sep 17 00:00:00 2001
2From: Kamil Dudka <kdudka@redhat.com>
3Date: Mon, 22 Aug 2016 10:24:35 +0200
4Subject: [PATCH] nss: refuse previously loaded certificate from file
5
6... when we are not asked to use a certificate from file
7
8Bug: https://curl.haxx.se/docs/adv_20160907.html
9Reported-by: kdudka@redhat.com
10
11Upstream-Status: Backport
12https://curl.haxx.se/CVE-2016-5421.patch
13
14CVE: CVE-2016-7141
15Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
16---
17 lib/vtls/nss.c | 8 +++++++-
18 1 file changed, 7 insertions(+), 1 deletion(-)
19
20diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c
21index 20c4277..cfb2263 100644
22--- a/lib/vtls/nss.c
23+++ b/lib/vtls/nss.c
24@@ -1002,10 +1002,10 @@ static SECStatus SelectClientCert(void *arg, PRFileDesc *sock,
25 struct ssl_connect_data *connssl = (struct ssl_connect_data *)arg;
26 struct Curl_easy *data = connssl->data;
27 const char *nickname = connssl->client_nickname;
28+ static const char pem_slotname[] = "PEM Token #1";
29
30 if(connssl->obj_clicert) {
31 /* use the cert/key provided by PEM reader */
32- static const char pem_slotname[] = "PEM Token #1";
33 SECItem cert_der = { 0, NULL, 0 };
34 void *proto_win = SSL_RevealPinArg(sock);
35 struct CERTCertificateStr *cert;
36@@ -1067,6 +1067,12 @@ static SECStatus SelectClientCert(void *arg, PRFileDesc *sock,
37 if(NULL == nickname)
38 nickname = "[unknown]";
39
40+ if(!strncmp(nickname, pem_slotname, sizeof(pem_slotname) - 1U)) {
41+ failf(data, "NSS: refusing previously loaded certificate from file: %s",
42+ nickname);
43+ return SECFailure;
44+ }
45+
46 if(NULL == *pRetKey) {
47 failf(data, "NSS: private key not found for certificate: %s", nickname);
48 return SECFailure;
49--
502.7.4