| diff --git a/lib/ssl/sslinfo.c b/lib/ssl/sslinfo.c |
| index 216ab0f..7048eb8 100644 |
| --- a/lib/ssl/sslinfo.c |
| +++ b/lib/ssl/sslinfo.c |
| @@ -387,8 +387,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; |
| } |
| |
| @@ -399,13 +404,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; |
| @@ -426,6 +435,8 @@ SSL_ExportKeyingMaterial(PRFileDesc *fd, |
| valLen, out, outLen); |
| } |
| ssl_ReleaseSpecReadLock(ss); |
| + ssl_ReleaseSSL3HandshakeLock(ss); |
| + ssl_ReleaseRecvBufLock(ss); |
| |
| PORT_ZFree(val, valLen); |
| return rv; |