Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 732258: ssl3_FinishHandshake cleanup. Fix the unused variable compiler

Browse Source 
warning about 'rv' and simplify the conditional expression around the
ss->sec.cache call.  r=bsmith.


git-svn-id: svn://10.0.0.236/trunk@263520 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
wtc%google.com 2012-03-06 02:23:25 +00:00
parent eae9177a84
commit 35ee8cc42f
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/security/nss/lib/ssl/ssl3con.c
View File

@ -40,7 +40,7 @@
* the terms of any one of the MPL, the GPL or the LGPL. * the terms of any one of the MPL, the GPL or the LGPL.
* *
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
/* $Id: ssl3con.c,v 1.166 2012-03-06 00:26:31 wtc%google.com Exp $ */ /* $Id: ssl3con.c,v 1.167 2012-03-06 02:23:25 wtc%google.com Exp $ */
#include "cert.h" #include "cert.h"
#include "ssl.h" #include "ssl.h"
@ -8613,8 +8613,6 @@ xmit_loser:
SECStatus SECStatus
ssl3_FinishHandshake(sslSocket * ss) ssl3_FinishHandshake(sslSocket * ss)
{ {
SECStatus rv;
PORT_Assert( ss->opt.noLocks || ssl_HaveRecvBufLock(ss) ); PORT_Assert( ss->opt.noLocks || ssl_HaveRecvBufLock(ss) );
PORT_Assert( ss->opt.noLocks || ssl_HaveSSL3HandshakeLock(ss) ); PORT_Assert( ss->opt.noLocks || ssl_HaveSSL3HandshakeLock(ss) );
PORT_Assert( ss->ssl3.hs.restartTarget == NULL ); PORT_Assert( ss->ssl3.hs.restartTarget == NULL );
@ -8623,9 +8621,9 @@ ssl3_FinishHandshake(sslSocket * ss)
ss->handshake = NULL; ss->handshake = NULL;
ss->firstHsDone = PR_TRUE; ss->firstHsDone = PR_TRUE;
if (ss->sec.ci.sid->cached == never_cached && if (ss->ssl3.hs.cacheSID) {
!ss->opt.noCache && ss->sec.cache && ss->ssl3.hs.cacheSID) {
(*ss->sec.cache)(ss->sec.ci.sid); (*ss->sec.cache)(ss->sec.ci.sid);
ss->ssl3.hs.cacheSID = PR_FALSE;
} }
ss->ssl3.hs.ws = idle_handshake; ss->ssl3.hs.ws = idle_handshake;