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

Side by Side 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 unified diff | Download patch
OLDNEW
(Empty)
1 diff --git a/lib/ssl/sslinfo.c b/lib/ssl/sslinfo.c
2 index 527b1a4..c59879c 100644
3 --- a/lib/ssl/sslinfo.c
4 +++ b/lib/ssl/sslinfo.c
5 @@ -406,8 +406,13 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd,
6 return SECFailure;
7 }
8
9 + ssl_GetRecvBufLock(ss);
10 + ssl_GetSSL3HandshakeLock(ss);
11 +
12 if (ss->version < SSL_LIBRARY_VERSION_3_1_TLS) {
13 PORT_SetError(SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_VERSION);
14 + ssl_ReleaseSSL3HandshakeLock(ss);
15 + ssl_ReleaseRecvBufLock(ss);
16 return SECFailure;
17 }
18
19 @@ -418,6 +423,8 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd,
20 }
21 val = PORT_Alloc(valLen);
22 if (!val) {
23 + ssl_ReleaseSSL3HandshakeLock(ss);
24 + ssl_ReleaseRecvBufLock(ss);
25 return SECFailure;
26 }
27 i = 0;
28 @@ -445,6 +452,8 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd,
29 valLen, out, outLen);
30 }
31 ssl_ReleaseSpecReadLock(ss);
32 + ssl_ReleaseSSL3HandshakeLock(ss);
33 + ssl_ReleaseRecvBufLock(ss);
34
35 PORT_ZFree(val, valLen);
36 return rv;
OLDNEW
« 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