net/third_party/nss/patches/aes256keylength.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/aes256keylength.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 Index: mozilla/security/nss/lib/ssl/sslsnce.c	1 diff -pu a/nss/lib/ssl/sslsnce.c b/nss/lib/ssl/sslsnce.c

2 ===================================================================	2 --- a/nss/lib/ssl/sslsnce.c» 2013-04-27 09:17:17.216390477 -0700

3 RCS file: /cvsroot/mozilla/security/nss/lib/ssl/sslsnce.c,v	3 +++ b/nss/lib/ssl/sslsnce.c» 2013-04-27 09:41:36.887048239 -0700

4 retrieving revision 1.63

5 diff -p -u -r1.63 sslsnce.c

6 --- mozilla/security/nss/lib/ssl/sslsnce.c» 14 Jun 2012 19:04:59 -0000» 1.63

7 +++ mozilla/security/nss/lib/ssl/sslsnce.c» 2 Mar 2013 00:31:22 -0000

8 @@ -87,6 +87,11 @@	4 @@ -87,6 +87,11 @@

9 #include "nspr.h"	5 #include "nspr.h"

10 #include "sslmutex.h"	6 #include "sslmutex.h"

11	7

12 +/* AES_256_KEY_LENGTH was added to blapit.h in NSS 3.12.10. */	8 +/* AES_256_KEY_LENGTH was added to blapit.h in NSS 3.12.10. */

13 +#ifndef AES_256_KEY_LENGTH	9 +#ifndef AES_256_KEY_LENGTH

14 +#define AES_256_KEY_LENGTH 32 /* bytes */	10 +#define AES_256_KEY_LENGTH 32 /* bytes */

15 +#endif	11 +#endif

16 +	12 +

17 /*	13 /*

18 ** Format of a cache entry in the shared memory.	14 ** Format of a cache entry in the shared memory.

19 */	15 */

OLD	NEW