When performing an SSL renegotiation and requesting a certificate status, clear any existing certif…

net/third_party/nss/ssl/ssl3con.c

 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * SSL3 Protocol
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /* $Id: ssl3con.c,v 1.192 2012/09/28 05:10:25 wtc%google.com Exp $ */
 
 /* TODO(ekr): Implement HelloVerifyRequest on server side. OK for now. */
@@ skipping 4166 matching lines @@
     if (rv != SECSuccess) {
         return rv;              /* ssl3_InitState has set the error code. */
     }
     ss->ssl3.hs.sendingSCSV = PR_FALSE; /* Must be reset every handshake */
     PORT_Assert(IS_DTLS(ss) || !resending);
 
     /* We might be starting a session renegotiation in which case we should
      * clear previous state.
      */
     PORT_Memset(&ss->xtnData, 0, sizeof(TLSExtensionData));
+    ss->ssl3.hs.may_get_cert_status = PR_FALSE;
+    if (ss->ssl3.hs.cert_status.data) {
+        SECITEM_FreeItem(&ss->ssl3.hs.cert_status, PR_FALSE);
+    }

[wtc, 2013/02/25 23:59:21]

This is a good place to clear these two members.

NOTE: This bug seems similar to a bug you fixed before:

----------------------------
revision 1.150
date: 2011/01/22 02:25:06;  author: wtc%google.com;  state: Exp;  lines: +20 -22
Bug 616757: in ssl3_SendCertificateVerify, we must destroy
ss->ssl3.clientPrivateKey for all key exchange algorithms, otherwise we
will send a Certificate message in renegotiation even if the renegotiation
doesn't request client auth.  Move the cleanup of clientCertChain and
clientPrivateKey from ssl3_HandleCertificateRequest to
ssl3_HandleServerHello as a second defense.  The patch is contributed by
Ryan Sleevi <ryan.sleevi@gmail.com>.  r=wtc.
----------------------------

In that bug, we clear the relevant members in ssl3_HandleServerHello. I don't
know why we didn't add
that code to ssl3_SendClientHello. Do you remember?

It would be nice to consolidate the code all in this
function.

 
     SSL_TRC(30,("%d: SSL3[%d]: reset handshake hashes",
             SSL_GETPID(), ss->fd ));
     rv = ssl3_RestartHandshakeHashes(ss);
     if (rv != SECSuccess) {
         return rv;
     }
 
     /*
      * During a renegotiation, ss->clientHelloVersion will be used again to
@@ skipping 7065 matching lines @@
             PORT_Free(ss->ssl3.hs.recvdFragments.buf);
         }
     }
 
     ss->ssl3.initialized = PR_FALSE;
 
     SECITEM_FreeItem(&ss->ssl3.nextProto, PR_FALSE);
 }
 
 /* End of ssl3con.c */