net/third_party/nss/patches/negotiatedextension.patch - Issue 14522022: Update NSS libSSL to NSS_3_15_BETA2.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: net/third_party/nss/patches/negotiatedextension.patch

Issue 14522022: Update NSS libSSL to NSS_3_15_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Make the changes rsleevi suggested Created 7 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « net/third_party/nss/patches/getrequestedclientcerttypes.patch ('k') | net/third_party/nss/patches/ocspstapling.patch » ('j') | net/third_party/nss/ssl/ssl3con.c » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 diff -pu -r a/net/third_party/nss/ssl/sslreveal.c b/net/third_party/nss/ssl/sslr eveal.c	1 diff -pu a/nss/lib/ssl/sslreveal.c b/nss/lib/ssl/sslreveal.c

2 --- a/net/third_party/nss/ssl/sslreveal.c» 2012-04-25 07:50:12.000000000 -0 700	2 --- a/nss/lib/ssl/sslreveal.c» 2013-04-27 09:17:17.216390477 -0700

3 +++ b/net/third_party/nss/ssl/sslreveal.c» 2012-11-09 15:45:44.118267683 -0 800	3 +++ b/nss/lib/ssl/sslreveal.c» 2013-04-27 09:22:26.910775670 -0700

4 @@ -79,7 +79,6 @@ SSL_HandshakeNegotiatedExtension(PRFileD	4 @@ -79,7 +79,6 @@ SSL_HandshakeNegotiatedExtension(PRFileD

5 /* some decisions derived from SSL_GetChannelInfo */	5 /* some decisions derived from SSL_GetChannelInfo */

6 sslSocket * sslsocket = NULL;	6 sslSocket * sslsocket = NULL;

7 SECStatus rv = SECFailure;	7 SECStatus rv = SECFailure;

8 - PRBool enoughFirstHsDone = PR_FALSE;	8 - PRBool enoughFirstHsDone = PR_FALSE;

9	9

10 if (!pYes)	10 if (!pYes)

11 return rv;	11 return rv;

12 @@ -91,14 +90,8 @@ SSL_HandshakeNegotiatedExtension(PRFileD	12 @@ -91,14 +90,8 @@ SSL_HandshakeNegotiatedExtension(PRFileD

13 return rv;	13 return rv;

14 }	14 }

15	15

16 - if (sslsocket->firstHsDone) {	16 - if (sslsocket->firstHsDone) {

17 - enoughFirstHsDone = PR_TRUE;	17 - enoughFirstHsDone = PR_TRUE;

18 - } else if (sslsocket->ssl3.initialized && ssl3_CanFalseStart(sslsocket)) {	18 - } else if (sslsocket->ssl3.initialized && ssl3_CanFalseStart(sslsocket)) {

19 - enoughFirstHsDone = PR_TRUE;	19 - enoughFirstHsDone = PR_TRUE;

20 - }	20 - }

21 -	21 -

22 /* according to public API SSL_GetChannelInfo, this doesn't need a lock */	22 /* according to public API SSL_GetChannelInfo, this doesn't need a lock */

23 - if (sslsocket->opt.useSecurity && enoughFirstHsDone) {	23 - if (sslsocket->opt.useSecurity && enoughFirstHsDone) {

24 + if (sslsocket->opt.useSecurity) {	24 + if (sslsocket->opt.useSecurity) {

25 if (sslsocket->ssl3.initialized) { /* SSL3 and TLS */	25 if (sslsocket->ssl3.initialized) { /* SSL3 and TLS */

26 /* now we know this socket went through ssl3_InitState() and	26 /* now we know this socket went through ssl3_InitState() and

27 * ss->xtnData got initialized, which is the only member accessed by	27 * ss->xtnData got initialized, which is the only member accessed by

OLD	NEW