net/third_party/nss/patches/secretexporterlocks.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/secretexporterlocks.patch

Issue 14522022: Update NSS libSSL to NSS_3_15_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Sync README.chromium 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:

View unified diff | Download patch | Annotate | Revision Log

« net/third_party/nss/patches/secitemarray.patch ('K') | « net/third_party/nss/patches/secitemarray.patch ('k') | net/third_party/nss/patches/sslkeylogerror.patch » ('j') | net/third_party/nss/ssl/ssl3con.c » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 diff -pu -r a/net/third_party/nss/ssl/sslinfo.c b/net/third_party/nss/ssl/sslinf o.c	1 diff -pu a/nss/lib/ssl/sslinfo.c b/nss/lib/ssl/sslinfo.c

2 --- a/net/third_party/nss/ssl/sslinfo.c»2012-08-03 16:54:31.000000000 -0700	2 --- a/nss/lib/ssl/sslinfo.c» 2013-04-27 09:17:17.216390477 -0700

3 +++ b/net/third_party/nss/ssl/sslinfo.c»2012-11-12 16:14:30.596704310 -0800	3 +++ b/nss/lib/ssl/sslinfo.c» 2013-04-27 09:40:33.236147965 -0700

4 @@ -342,8 +342,13 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd,	4 @@ -342,8 +342,13 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd,

5 return SECFailure;	5 return SECFailure;

6 }	6 }

7	7

8 + ssl_GetRecvBufLock(ss);	8 + ssl_GetRecvBufLock(ss);

9 + ssl_GetSSL3HandshakeLock(ss);	9 + ssl_GetSSL3HandshakeLock(ss);

10 +	10 +

11 if (ss->version < SSL_LIBRARY_VERSION_3_1_TLS) {	11 if (ss->version < SSL_LIBRARY_VERSION_3_1_TLS) {

12 PORT_SetError(SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_VERSION);	12 PORT_SetError(SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_VERSION);

13 + ssl_ReleaseSSL3HandshakeLock(ss);	13 + ssl_ReleaseSSL3HandshakeLock(ss);

(...skipping 21 matching lines...) Expand all Loading...
35 val[i++] = contextLen;	35 val[i++] = contextLen;

36 @@ -381,6 +390,8 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd,	36 @@ -381,6 +390,8 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd,

37 valLen, out, outLen);	37 valLen, out, outLen);

38 }	38 }

39 ssl_ReleaseSpecReadLock(ss);	39 ssl_ReleaseSpecReadLock(ss);

40 + ssl_ReleaseSSL3HandshakeLock(ss);	40 + ssl_ReleaseSSL3HandshakeLock(ss);

41 + ssl_ReleaseRecvBufLock(ss);	41 + ssl_ReleaseRecvBufLock(ss);

42	42

43 PORT_ZFree(val, valLen);	43 PORT_ZFree(val, valLen);

44 return rv;	44 return rv;

OLD	NEW