author | Yiteng Zhang <yiteng.zhang@oracle.com> |
Tue, 25 Oct 2016 14:43:21 -0700 | |
changeset 7157 | f898d6948e00 |
permissions | -rw-r--r-- |
7157
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
1 |
From f6474ff3bfb38c28b70b5ba01048edc41f654376 Mon Sep 17 00:00:00 2001 |
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
2 |
From: Daniel Stenberg <[email protected]> |
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
3 |
Date: Sun, 31 Jul 2016 00:51:48 +0200 |
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
4 |
Subject: [PATCH] TLS: only reuse connections with the same client cert |
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
5 |
|
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
6 |
CVE-2016-5420 |
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
7 |
Bug: https://curl.haxx.se/docs/adv_20160803B.html |
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
8 |
--- |
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
9 |
lib/vtls/vtls.c | 1 + |
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
10 |
1 file changed, 1 insertion(+) |
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
11 |
|
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
12 |
--- lib/vtls/vtls.c |
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
13 |
+++ lib/vtls/vtls.c |
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
14 |
@@ -97,10 +97,11 @@ Curl_ssl_config_matches(struct ssl_config_data* data, |
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
15 |
if((data->version == needle->version) && |
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
16 |
(data->verifypeer == needle->verifypeer) && |
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
17 |
(data->verifyhost == needle->verifyhost) && |
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
18 |
safe_strequal(data->CApath, needle->CApath) && |
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
19 |
safe_strequal(data->CAfile, needle->CAfile) && |
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
20 |
+ safe_strequal(data->clientcert, needle->clientcert) && |
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
21 |
safe_strequal(data->random_file, needle->random_file) && |
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
22 |
safe_strequal(data->egdsocket, needle->egdsocket) && |
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
23 |
safe_strequal(data->cipher_list, needle->cipher_list)) |
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
24 |
return TRUE; |
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
25 |
|
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
26 |
-- |
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
27 |
2.8.1 |
f898d6948e00
22972477 curl should support HTTP/2 protocol
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
28 |