net/third_party/nss/patches/sslnoncestatics.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/sslnoncestatics.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: Add CT TLS extension bug number 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 --git a/net/third_party/nss/ssl/sslnonce.c b/net/third_party/nss/ssl/sslnon ce.c	1 diff -pu a/nss/lib/ssl/sslnonce.c b/nss/lib/ssl/sslnonce.c

2 index 758aa4e..a3e6e0a 100644	2 --- a/nss/lib/ssl/sslnonce.c» 2014-01-03 19:08:32.451674629 -0800

3 --- a/net/third_party/nss/ssl/sslnonce.c	3 +++ b/nss/lib/ssl/sslnonce.c» 2014-01-03 19:10:33.483652358 -0800

4 +++ b/net/third_party/nss/ssl/sslnonce.c

5 @@ -21,8 +21,8 @@	4 @@ -21,8 +21,8 @@

6 PRUint32 ssl_sid_timeout = 100;	5 PRUint32 ssl_sid_timeout = 100;

7 PRUint32 ssl3_sid_timeout = 86400L; /* 24 hours */	6 PRUint32 ssl3_sid_timeout = 86400L; /* 24 hours */

8	7

9 -static sslSessionID *cache = NULL;	8 -static sslSessionID *cache = NULL;

10 -static PZLock * cacheLock = NULL;	9 -static PZLock * cacheLock = NULL;

11 +sslSessionID *cache = NULL;	10 +sslSessionID *cache = NULL;

12 +PZLock * cacheLock = NULL;	11 +PZLock * cacheLock = NULL;

13	12

14 /* sids can be in one of 4 states:	13 /* sids can be in one of 4 states:

15 *	14 *

OLD	NEW