net/third_party/nss/patches/suitebonly.patch - Issue 1053903002: Update libssl to NSS 3.18 RTM

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 1053903002: Update libssl to NSS 3.18 RTM (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 8 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 --git a/ssl/ssl3ecc.c b/ssl/ssl3ecc.c

2 --- a/nss/lib/ssl/ssl3ecc.c» 2014-01-03 19:28:03.550814608 -0800	2 index 555c89d..0f805ec 100644

3 +++ b/nss/lib/ssl/ssl3ecc.c» 2014-01-03 19:40:46.523288747 -0800	3 --- a/ssl/ssl3ecc.c

4 @@ -1073,6 +1073,7 @@ static const PRUint8 ecPtFmt[6] = {	4 +++ b/ssl/ssl3ecc.c

	5 @@ -1089,6 +1089,7 @@ static const PRUint8 ecPtFmt[6] = {

5 static PRBool	6 static PRBool

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

7 {	8 {

8 +#if 0	9 +#if 0

9 /* See if we can support small curves (like 163). If not, assume we can	10 /* 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). */	11 * only support Suite-B curves (P-256, P-384, P-521). */

11 PK11SlotInfo *slot =	12 PK11SlotInfo *slot =

12 @@ -1086,6 +1087,9 @@ ssl3_SuiteBOnly(sslSocket *ss)	13 @@ -1102,6 +1103,9 @@ ssl3_SuiteBOnly(sslSocket *ss)

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

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

15 return PR_FALSE;	16 return PR_FALSE;

16 +#else	17 +#else

17 + return PR_TRUE;	18 + return PR_TRUE;

18 +#endif	19 +#endif

19 }	20 }

20	21

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

OLD	NEW