nss/patches/nss-warnings.patch - Issue 10540165: Update NSS to NSS 3.13.5 (from NSS 3.13.3).

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: nss/patches/nss-warnings.patch

Issue 10540165: Update NSS to NSS 3.13.5 (from NSS 3.13.3). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/

Patch Set: Created 8 years, 6 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:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 Index: mozilla/security/nss/lib/softoken/pkcs11c.c	1 Index: mozilla/security/nss/lib/softoken/pkcs11c.c

2 ===================================================================	2 ===================================================================

3 --- mozilla/security/nss/lib/softoken/pkcs11c.c (revision 135940)	3 --- mozilla/security/nss/lib/softoken/pkcs11c.c (revision 135940)

4 +++ mozilla/security/nss/lib/softoken/pkcs11c.c (working copy)	4 +++ mozilla/security/nss/lib/softoken/pkcs11c.c (working copy)

5 @@ -6167,9 +6167,9 @@	5 @@ -6167,9 +6167,9 @@

6 const SECHashObject * rawHash;	6 const SECHashObject * rawHash;

7 unsigned hashLen;	7 unsigned hashLen;

8 CK_BYTE buf[HASH_LENGTH_MAX];	8 CK_BYTE buf[HASH_LENGTH_MAX];

9 - /* const / CK_BYTE prk; /* psuedo-random key */	9 - /* const / CK_BYTE prk; /* psuedo-random key */

10 + CK_BYTE * prk; /* psuedo-random key */	10 + CK_BYTE * prk; /* psuedo-random key */

11 CK_ULONG prkLen;	11 CK_ULONG prkLen;

12 - const CK_BYTE * okm; /* output keying material */	12 - const CK_BYTE * okm; /* output keying material */

13 + CK_BYTE * okm; /* output keying material */	13 + CK_BYTE * okm; /* output keying material */

14	14

15 rawHash = HASH_GetRawHashObject(hashType);	15 rawHash = HASH_GetRawHashObject(hashType);

16 if (rawHash == NULL \|\| rawHash->length > sizeof buf) {	16 if (rawHash == NULL \|\| rawHash->length > sizeof buf) {

17 Index: mozilla/security/nss/lib/certdb/stanpcertdb.c

18 ===================================================================

19 --- mozilla/security/nss/lib/certdb/stanpcertdb.c (revision 135940)

20 +++ mozilla/security/nss/lib/certdb/stanpcertdb.c (working copy)

21 @@ -631,7 +631,7 @@

22

23 static CERTCertificate *

24 common_FindCertByNicknameOrEmailAddrForUsage(CERTCertDBHandle *handle,

25 - char *name,

26 + const char *name,

27 PRBool anyUsage,

28 SECCertUsage lookingForUsage)

29 {

OLD	NEW

« nss/mozilla/security/nss/lib/util/SECerrs.h ('K') | « nss/mozilla/security/nss/lib/util/secitem.c ('k') | nss/scripts/nss-checkout.sh » ('j') | no next file with comments »