OLD | NEW |
1 diff -pu a/nss/lib/ssl/sslinfo.c b/nss/lib/ssl/sslinfo.c | 1 diff --git a/ssl/sslinfo.c b/ssl/sslinfo.c |
2 --- a/nss/lib/ssl/sslinfo.c» 2014-01-17 17:49:26.072517368 -0800 | 2 index 00f2f38..ba230d2 100644 |
3 +++ b/nss/lib/ssl/sslinfo.c» 2014-01-17 18:00:29.773545219 -0800 | 3 --- a/ssl/sslinfo.c |
| 4 +++ b/ssl/sslinfo.c |
4 @@ -350,8 +350,13 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd, | 5 @@ -350,8 +350,13 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd, |
5 return SECFailure; | 6 return SECFailure; |
6 } | 7 } |
7 | 8 |
8 + ssl_GetRecvBufLock(ss); | 9 + ssl_GetRecvBufLock(ss); |
9 + ssl_GetSSL3HandshakeLock(ss); | 10 + ssl_GetSSL3HandshakeLock(ss); |
10 + | 11 + |
11 if (ss->version < SSL_LIBRARY_VERSION_3_1_TLS) { | 12 if (ss->version < SSL_LIBRARY_VERSION_3_1_TLS) { |
12 PORT_SetError(SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_VERSION); | 13 PORT_SetError(SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_VERSION); |
13 + ssl_ReleaseSSL3HandshakeLock(ss); | 14 + ssl_ReleaseSSL3HandshakeLock(ss); |
(...skipping 21 matching lines...) Expand all Loading... |
35 val[i++] = contextLen; | 36 val[i++] = contextLen; |
36 @@ -389,6 +398,8 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd, | 37 @@ -389,6 +398,8 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd, |
37 valLen, out, outLen); | 38 valLen, out, outLen); |
38 } | 39 } |
39 ssl_ReleaseSpecReadLock(ss); | 40 ssl_ReleaseSpecReadLock(ss); |
40 + ssl_ReleaseSSL3HandshakeLock(ss); | 41 + ssl_ReleaseSSL3HandshakeLock(ss); |
41 + ssl_ReleaseRecvBufLock(ss); | 42 + ssl_ReleaseRecvBufLock(ss); |
42 | 43 |
43 PORT_ZFree(val, valLen); | 44 PORT_ZFree(val, valLen); |
44 return rv; | 45 return rv; |
OLD | NEW |