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

net/third_party/nss/ssl/ssl3con.c

Index: net/third_party/nss/ssl/ssl3con.c
diff --git a/net/third_party/nss/ssl/ssl3con.c b/net/third_party/nss/ssl/ssl3con.c
index 4ed4b281e23c3784c9824e513d1d4a27aa5abb12..ee960890f836fb8bdb2ec76ca64bc1145f793d5b 100644
--- a/net/third_party/nss/ssl/ssl3con.c
+++ b/net/third_party/nss/ssl/ssl3con.c
@@ -4184,6 +4184,10 @@ ssl3_SendClientHello(sslSocket *ss, PRBool resending)
      * 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 ));