Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/curl/patches/008-CVE-2016-5420.patch
author Yiteng Zhang <yiteng.zhang@oracle.com>
Tue, 25 Oct 2016 14:43:21 -0700
branchs11u3-sru
changeset 7255 c7815ed3b336
permissions -rw-r--r--
24409713 problem in LIBRARY/CURL 24409702 problem in LIBRARY/CURL 24409726 problem in LIBRARY/CURL 24409740 problem in LIBRARY/CURL 24832800 problem in LIBRARY/CURL
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7255
c7815ed3b336 24409713 problem in LIBRARY/CURL
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff changeset 
     1
 
From f6474ff3bfb38c28b70b5ba01048edc41f654376 Mon Sep 17 00:00:00 2001
c7815ed3b336 24409713 problem in LIBRARY/CURL
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff changeset 
     2
 
From: Daniel Stenberg <[email protected]>
c7815ed3b336 24409713 problem in LIBRARY/CURL
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff changeset 
     3
 
Date: Sun, 31 Jul 2016 00:51:48 +0200
c7815ed3b336 24409713 problem in LIBRARY/CURL
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff changeset 
     4
 
Subject: [PATCH] TLS: only reuse connections with the same client cert
c7815ed3b336 24409713 problem in LIBRARY/CURL
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff changeset 
     5
 












c7815ed3b336
24409713 problem in LIBRARY/CURL



Yiteng Zhang <yiteng.zhang@oracle.com>


parents: 

diff
changeset




     6


CVE-2016-5420













c7815ed3b336
24409713 problem in LIBRARY/CURL



Yiteng Zhang <yiteng.zhang@oracle.com>


parents: 

diff
changeset




     7


Bug: https://curl.haxx.se/docs/adv_20160803B.html













c7815ed3b336
24409713 problem in LIBRARY/CURL



Yiteng Zhang <yiteng.zhang@oracle.com>


parents: 

diff
changeset




     8


---













c7815ed3b336
24409713 problem in LIBRARY/CURL



Yiteng Zhang <yiteng.zhang@oracle.com>


parents: 

diff
changeset




     9


 lib/vtls/vtls.c | 1 +













c7815ed3b336
24409713 problem in LIBRARY/CURL



Yiteng Zhang <yiteng.zhang@oracle.com>


parents: 

diff
changeset




    10


 1 file changed, 1 insertion(+)













c7815ed3b336
24409713 problem in LIBRARY/CURL



Yiteng Zhang <yiteng.zhang@oracle.com>


parents: 

diff
changeset




    11














c7815ed3b336
24409713 problem in LIBRARY/CURL



Yiteng Zhang <yiteng.zhang@oracle.com>


parents: 

diff
changeset




    12


--- lib/vtls/vtls.c













c7815ed3b336
24409713 problem in LIBRARY/CURL



Yiteng Zhang <yiteng.zhang@oracle.com>


parents: 

diff
changeset




    13


+++ lib/vtls/vtls.c













c7815ed3b336
24409713 problem in LIBRARY/CURL



Yiteng Zhang <yiteng.zhang@oracle.com>


parents: 

diff
changeset




    14


@@ -97,10 +97,11 @@ Curl_ssl_config_matches(struct ssl_config_data* data,













c7815ed3b336
24409713 problem in LIBRARY/CURL



Yiteng Zhang <yiteng.zhang@oracle.com>


parents: 

diff
changeset




    15


   if((data->version == needle->version) &&













c7815ed3b336
24409713 problem in LIBRARY/CURL



Yiteng Zhang <yiteng.zhang@oracle.com>


parents: 

diff
changeset




    16


      (data->verifypeer == needle->verifypeer) &&













c7815ed3b336
24409713 problem in LIBRARY/CURL



Yiteng Zhang <yiteng.zhang@oracle.com>


parents: 

diff
changeset




    17


      (data->verifyhost == needle->verifyhost) &&













c7815ed3b336
24409713 problem in LIBRARY/CURL



Yiteng Zhang <yiteng.zhang@oracle.com>


parents: 

diff
changeset




    18


      safe_strequal(data->CApath, needle->CApath) &&













c7815ed3b336
24409713 problem in LIBRARY/CURL



Yiteng Zhang <yiteng.zhang@oracle.com>


parents: 

diff
changeset




    19


      safe_strequal(data->CAfile, needle->CAfile) &&













c7815ed3b336
24409713 problem in LIBRARY/CURL



Yiteng Zhang <yiteng.zhang@oracle.com>


parents: 

diff
changeset




    20


+     safe_strequal(data->clientcert, needle->clientcert) &&













c7815ed3b336
24409713 problem in LIBRARY/CURL



Yiteng Zhang <yiteng.zhang@oracle.com>


parents: 

diff
changeset




    21


      safe_strequal(data->random_file, needle->random_file) &&













c7815ed3b336
24409713 problem in LIBRARY/CURL



Yiteng Zhang <yiteng.zhang@oracle.com>


parents: 

diff
changeset




    22


      safe_strequal(data->egdsocket, needle->egdsocket) &&













c7815ed3b336
24409713 problem in LIBRARY/CURL



Yiteng Zhang <yiteng.zhang@oracle.com>


parents: 

diff
changeset




    23


      safe_strequal(data->cipher_list, needle->cipher_list))













c7815ed3b336
24409713 problem in LIBRARY/CURL



Yiteng Zhang <yiteng.zhang@oracle.com>


parents: 

diff
changeset




    24


     return TRUE;













c7815ed3b336
24409713 problem in LIBRARY/CURL



Yiteng Zhang <yiteng.zhang@oracle.com>


parents: 

diff
changeset




    25


 













c7815ed3b336
24409713 problem in LIBRARY/CURL



Yiteng Zhang <yiteng.zhang@oracle.com>


parents: 

diff
changeset




    26


-- 













c7815ed3b336
24409713 problem in LIBRARY/CURL



Yiteng Zhang <yiteng.zhang@oracle.com>


parents: 

diff
changeset




    27


2.8.1













c7815ed3b336
24409713 problem in LIBRARY/CURL



Yiteng Zhang <yiteng.zhang@oracle.com>


parents: 

diff
changeset




    28
















upstream/oracle/userland-gate