net/third_party/nss/patches/suitebonly.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/suitebonly.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
1 diff -pu a/nss/lib/ssl/ssl3ecc.c b/nss/lib/ssl/ssl3ecc.c	1 diff -pu a/nss/lib/ssl/ssl3ecc.c b/nss/lib/ssl/ssl3ecc.c

2 --- a/nss/lib/ssl/ssl3ecc.c» 2013-07-31 14:11:13.633890784 -0700	2 --- a/nss/lib/ssl/ssl3ecc.c» 2014-01-03 19:28:03.550814608 -0800

3 +++ b/nss/lib/ssl/ssl3ecc.c» 2013-07-31 14:12:59.855450386 -0700	3 +++ b/nss/lib/ssl/ssl3ecc.c» 2014-01-03 19:40:46.523288747 -0800

4 @@ -1078,6 +1078,7 @@ static const PRUint8 ecPtFmt[6] = {	4 @@ -1073,6 +1073,7 @@ static const PRUint8 ecPtFmt[6] = {

5 static PRBool	5 static PRBool

6 ssl3_SuiteBOnly(sslSocket *ss)	6 ssl3_SuiteBOnly(sslSocket *ss)

7 {	7 {

8 +#if 0	8 +#if 0

9 /* See if we can support small curves (like 163). If not, assume we can	9 /* See if we can support small curves (like 163). If not, assume we can

10 * only support Suite-B curves (P-256, P-384, P-521). */	10 * only support Suite-B curves (P-256, P-384, P-521). */

11 PK11SlotInfo *slot =	11 PK11SlotInfo *slot =

12 @@ -1091,6 +1092,9 @@ ssl3_SuiteBOnly(sslSocket *ss)	12 @@ -1086,6 +1087,9 @@ ssl3_SuiteBOnly(sslSocket *ss)

13 /* we can, presume we can do all curves */	13 /* we can, presume we can do all curves */

14 PK11_FreeSlot(slot);	14 PK11_FreeSlot(slot);

15 return PR_FALSE;	15 return PR_FALSE;

16 +#else	16 +#else

17 + return PR_TRUE;	17 + return PR_TRUE;

18 +#endif	18 +#endif

19 }	19 }

20	20

21 /* Send our "canned" (precompiled) Supported Elliptic Curves extension,	21 /* Send our "canned" (precompiled) Supported Elliptic Curves extension,

OLD	NEW