net/third_party/nss/patches/ecpointform.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/ecpointform.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:

OLD	NEW
1 diff -pu -r a/net/third_party/nss/ssl/ssl3ecc.c b/net/third_party/nss/ssl/ssl3ec c.c	1 diff -pu a/nss/lib/ssl/ssl3ecc.c b/nss/lib/ssl/ssl3ecc.c

2 --- a/net/third_party/nss/ssl/ssl3ecc.c»2012-06-10 19:38:30.000000000 -0700	2 --- a/nss/lib/ssl/ssl3ecc.c» 2013-04-27 09:17:17.216390477 -0700

3 +++ b/net/third_party/nss/ssl/ssl3ecc.c»2012-11-12 15:57:59.222697369 -0800	3 +++ b/nss/lib/ssl/ssl3ecc.c» 2013-04-27 09:40:07.665786293 -0700

4 @@ -33,6 +33,15 @@	4 @@ -33,6 +33,15 @@

5	5

6 #ifdef NSS_ENABLE_ECC	6 #ifdef NSS_ENABLE_ECC

7	7

8 +/*	8 +/*

9 + * In NSS 3.13.2 the definition of the EC_POINT_FORM_UNCOMPRESSED macro	9 + * In NSS 3.13.2 the definition of the EC_POINT_FORM_UNCOMPRESSED macro

10 + * was moved from the internal header ec.h to the public header blapit.h.	10 + * was moved from the internal header ec.h to the public header blapit.h.

11 + * Define the macro here when compiling against older system NSS headers.	11 + * Define the macro here when compiling against older system NSS headers.

12 + */	12 + */

13 +#ifndef EC_POINT_FORM_UNCOMPRESSED	13 +#ifndef EC_POINT_FORM_UNCOMPRESSED

14 +#define EC_POINT_FORM_UNCOMPRESSED 0x04	14 +#define EC_POINT_FORM_UNCOMPRESSED 0x04

15 +#endif	15 +#endif

16 +	16 +

17 #ifndef PK11_SETATTRS	17 #ifndef PK11_SETATTRS

18 #define PK11_SETATTRS(x,id,v,l) (x)->type = (id); \	18 #define PK11_SETATTRS(x,id,v,l) (x)->type = (id); \

19 (x)->pValue=(v); (x)->ulValueLen = (l);	19 (x)->pValue=(v); (x)->ulValueLen = (l);

OLD	NEW