Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Side by Side Diff: net/third_party/nss/patches/secretexporterlocks.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: Update the comment in sslenum.c for the two CHACHA20 cipher suites 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 diff -pu a/nss/lib/ssl/sslinfo.c b/nss/lib/ssl/sslinfo.c 1 diff -pu a/nss/lib/ssl/sslinfo.c b/nss/lib/ssl/sslinfo.c
2 --- a/nss/lib/ssl/sslinfo.c» 2013-07-31 12:07:10.974699609 -0700 2 --- a/nss/lib/ssl/sslinfo.c» 2014-01-03 19:28:03.550814608 -0800
3 +++ b/nss/lib/ssl/sslinfo.c» 2013-07-31 14:11:28.834113906 -0700 3 +++ b/nss/lib/ssl/sslinfo.c» 2014-01-03 19:40:13.512748975 -0800
4 @@ -349,8 +349,13 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd, 4 @@ -350,8 +350,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);
14 + ssl_ReleaseRecvBufLock(ss); 14 + ssl_ReleaseRecvBufLock(ss);
15 return SECFailure; 15 return SECFailure;
16 } 16 }
17 17
18 @@ -361,13 +366,17 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd, 18 @@ -362,13 +367,17 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd,
19 } 19 }
20 val = PORT_Alloc(valLen); 20 val = PORT_Alloc(valLen);
21 if (!val) { 21 if (!val) {
22 + ssl_ReleaseSSL3HandshakeLock(ss); 22 + ssl_ReleaseSSL3HandshakeLock(ss);
23 + ssl_ReleaseRecvBufLock(ss); 23 + ssl_ReleaseRecvBufLock(ss);
24 return SECFailure; 24 return SECFailure;
25 } 25 }
26 i = 0; 26 i = 0;
27 + 27 +
28 PORT_Memcpy(val + i, &ss->ssl3.hs.client_random.rand, SSL3_RANDOM_LENGTH); 28 PORT_Memcpy(val + i, &ss->ssl3.hs.client_random.rand, SSL3_RANDOM_LENGTH);
29 i += SSL3_RANDOM_LENGTH; 29 i += SSL3_RANDOM_LENGTH;
30 PORT_Memcpy(val + i, &ss->ssl3.hs.server_random.rand, SSL3_RANDOM_LENGTH); 30 PORT_Memcpy(val + i, &ss->ssl3.hs.server_random.rand, SSL3_RANDOM_LENGTH);
31 i += SSL3_RANDOM_LENGTH; 31 i += SSL3_RANDOM_LENGTH;
32 + 32 +
33 if (hasContext) { 33 if (hasContext) {
34 val[i++] = contextLen >> 8; 34 val[i++] = contextLen >> 8;
35 val[i++] = contextLen; 35 val[i++] = contextLen;
36 @@ -388,6 +397,8 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd, 36 @@ -389,6 +398,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;
OLDNEW
« no previous file with comments | « net/third_party/nss/patches/secitemarray.patch ('k') | net/third_party/nss/patches/sessioncache.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698