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

Unified Diff: net/third_party/nss/patches/secretexporterlocks.patch

Issue 992733002: Remove //net (except for Android test stuff) and sdch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/third_party/nss/patches/secretexporterlocks.patch
diff --git a/net/third_party/nss/patches/secretexporterlocks.patch b/net/third_party/nss/patches/secretexporterlocks.patch
deleted file mode 100644
index 85d98dfdab4d9bdb97fde3075de70b91f6c98b91..0000000000000000000000000000000000000000
--- a/net/third_party/nss/patches/secretexporterlocks.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -pu a/nss/lib/ssl/sslinfo.c b/nss/lib/ssl/sslinfo.c
---- a/nss/lib/ssl/sslinfo.c 2014-01-17 17:49:26.072517368 -0800
-+++ b/nss/lib/ssl/sslinfo.c 2014-01-17 18:00:29.773545219 -0800
-@@ -350,8 +350,13 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd,
- return SECFailure;
- }
-
-+ ssl_GetRecvBufLock(ss);
-+ ssl_GetSSL3HandshakeLock(ss);
-+
- if (ss->version < SSL_LIBRARY_VERSION_3_1_TLS) {
- PORT_SetError(SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_VERSION);
-+ ssl_ReleaseSSL3HandshakeLock(ss);
-+ ssl_ReleaseRecvBufLock(ss);
- return SECFailure;
- }
-
-@@ -362,13 +367,17 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd,
- }
- val = PORT_Alloc(valLen);
- if (!val) {
-+ ssl_ReleaseSSL3HandshakeLock(ss);
-+ ssl_ReleaseRecvBufLock(ss);
- return SECFailure;
- }
- i = 0;
-+
- PORT_Memcpy(val + i, &ss->ssl3.hs.client_random.rand, SSL3_RANDOM_LENGTH);
- i += SSL3_RANDOM_LENGTH;
- PORT_Memcpy(val + i, &ss->ssl3.hs.server_random.rand, SSL3_RANDOM_LENGTH);
- i += SSL3_RANDOM_LENGTH;
-+
- if (hasContext) {
- val[i++] = contextLen >> 8;
- val[i++] = contextLen;
-@@ -389,6 +398,8 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd,
- valLen, out, outLen);
- }
- ssl_ReleaseSpecReadLock(ss);
-+ ssl_ReleaseSSL3HandshakeLock(ss);
-+ ssl_ReleaseRecvBufLock(ss);
-
- PORT_ZFree(val, valLen);
- return rv;
« 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