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

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

Issue 1882433002: Removing NSS files and USE_OPENSSL flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 8 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/restartclientauth.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 a95ef278d0ef428bfc2637d521c802cc5dcdf651..0000000000000000000000000000000000000000
--- a/net/third_party/nss/patches/secretexporterlocks.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/lib/ssl/sslinfo.c b/lib/ssl/sslinfo.c
-index 527b1a4..c59879c 100644
---- a/lib/ssl/sslinfo.c
-+++ b/lib/ssl/sslinfo.c
-@@ -406,8 +406,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;
- }
-
-@@ -418,6 +423,8 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd,
- }
- val = PORT_Alloc(valLen);
- if (!val) {
-+ ssl_ReleaseSSL3HandshakeLock(ss);
-+ ssl_ReleaseRecvBufLock(ss);
- return SECFailure;
- }
- i = 0;
-@@ -445,6 +452,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/restartclientauth.patch ('k') | net/third_party/nss/patches/sessioncache.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698