net/third_party/nss/patches/negotiatedextension.patch - Issue 111853013: Update net/third_party/nss to NSS 3.15.4.

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 111853013: Update net/third_party/nss to NSS 3.15.4. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Update the comment in sslenum.c for the two CHACHA20 cipher suites Created 6 years, 11 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:

OLD	NEW
	(Empty)
1 diff -pu a/nss/lib/ssl/sslreveal.c b/nss/lib/ssl/sslreveal.c

2 --- a/nss/lib/ssl/sslreveal.c 2013-07-31 12:07:10.974699609 -0700

3 +++ b/nss/lib/ssl/sslreveal.c 2013-07-31 12:41:08.684380521 -0700

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

5 {

6 /* some decisions derived from SSL_GetChannelInfo */

7 sslSocket * sslsocket = NULL;

8 - PRBool enoughFirstHsDone = PR_FALSE;

9

10 if (!pYes) {

11 PORT_SetError(SEC_ERROR_INVALID_ARGS);

12 @@ -93,14 +92,8 @@ SSL_HandshakeNegotiatedExtension(PRFileD

13

14 *pYes = PR_FALSE;

15

16 - if (sslsocket->firstHsDone) {

17 - enoughFirstHsDone = PR_TRUE;

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

19 - enoughFirstHsDone = PR_TRUE;

20 - }

21 -

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

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

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

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

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

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

OLD	NEW