diff options
| author | wtc%google.com <devnull@localhost> | 2011-03-30 17:38:42 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2011-03-30 17:38:42 +0000 |
| commit | adf41b922372f5667b253463498db1bd4fb3f10f (patch) | |
| tree | 4f15d7f7bfe74a8a94017da5b8bcbb1be2b52e6f /security | |
| parent | c1517fdd9fd49e0d7ebc932eca9c63f68cf79cf9 (diff) | |
| download | nss-hg-adf41b922372f5667b253463498db1bd4fb3f10f.tar.gz | |
Bug 588698 and Bug 638821: Fix locking order in ssl2_BeginClientHandshake.
Backported from the trunk, rev. 1.41. r=jseward.
Tag: NSS_3_12_BRANCH
Diffstat (limited to 'security')
| -rw-r--r-- | security/nss/lib/ssl/sslcon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/nss/lib/ssl/sslcon.c b/security/nss/lib/ssl/sslcon.c index 2c6dacc3b..3bace6ab0 100644 --- a/security/nss/lib/ssl/sslcon.c +++ b/security/nss/lib/ssl/sslcon.c @@ -3125,11 +3125,11 @@ ssl2_BeginClientHandshake(sslSocket *ss) /* ssl3_SendClientHello will override this if it succeeds. */ ss->version = SSL_LIBRARY_VERSION_3_0; - ssl_GetXmitBufLock(ss); /***************************************/ ssl_GetSSL3HandshakeLock(ss); + ssl_GetXmitBufLock(ss); rv = ssl3_SendClientHello(ss); + ssl_ReleaseXmitBufLock(ss); ssl_ReleaseSSL3HandshakeLock(ss); - ssl_ReleaseXmitBufLock(ss); /***************************************/ return rv; } |