summaryrefslogtreecommitdiff
path: root/security/nss/lib
diff options
context:
space:
mode:
Diffstat (limited to 'security/nss/lib')
-rw-r--r--security/nss/lib/ssl/ssl3con.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/security/nss/lib/ssl/ssl3con.c b/security/nss/lib/ssl/ssl3con.c
index f7b3a21be..a7269ba84 100644
--- a/security/nss/lib/ssl/ssl3con.c
+++ b/security/nss/lib/ssl/ssl3con.c
@@ -8613,8 +8613,6 @@ xmit_loser:
SECStatus
ssl3_FinishHandshake(sslSocket * ss)
{
- SECStatus rv;
-
PORT_Assert( ss->opt.noLocks || ssl_HaveRecvBufLock(ss) );
PORT_Assert( ss->opt.noLocks || ssl_HaveSSL3HandshakeLock(ss) );
PORT_Assert( ss->ssl3.hs.restartTarget == NULL );
@@ -8623,9 +8621,9 @@ ssl3_FinishHandshake(sslSocket * ss)
ss->handshake = NULL;
ss->firstHsDone = PR_TRUE;
- if (ss->sec.ci.sid->cached == never_cached &&
- !ss->opt.noCache && ss->sec.cache && ss->ssl3.hs.cacheSID) {
+ if (ss->ssl3.hs.cacheSID) {
(*ss->sec.cache)(ss->sec.ci.sid);
+ ss->ssl3.hs.cacheSID = PR_FALSE;
}
ss->ssl3.hs.ws = idle_handshake;