|
 |
1b6f66 |
diff -up ./nss/lib/ssl/ssl3con.c.fix_client_auth_crash ./nss/lib/ssl/ssl3con.c
|
|
|
1b6f66 |
--- ./nss/lib/ssl/ssl3con.c.fix_client_auth_crash 2016-02-24 10:40:56.249523174 -0800
|
|
|
1b6f66 |
+++ ./nss/lib/ssl/ssl3con.c 2016-02-24 10:56:24.180107667 -0800
|
|
|
1b6f66 |
@@ -6626,12 +6626,14 @@ ssl3_HandleServerHello(sslSocket *ss, SS
|
|
|
1b6f66 |
ss->ssl3.hs.preliminaryInfo |= ssl_preinfo_version;
|
|
|
1b6f66 |
isTLS = (ss->version > SSL_LIBRARY_VERSION_3_0);
|
|
|
1b6f66 |
|
|
|
1b6f66 |
+#ifdef notdef
|
|
|
1b6f66 |
rv = ssl3_InitHandshakeHashes(ss);
|
|
|
1b6f66 |
if (rv != SECSuccess) {
|
|
|
1b6f66 |
desc = internal_error;
|
|
|
1b6f66 |
errCode = PORT_GetError();
|
|
|
1b6f66 |
goto alert_loser;
|
|
|
1b6f66 |
}
|
|
|
1b6f66 |
+#endif
|
|
|
1b6f66 |
|
|
|
1b6f66 |
rv = ssl3_ConsumeHandshake(
|
|
|
1b6f66 |
ss, &ss->ssl3.hs.server_random, SSL3_RANDOM_LENGTH, &b, &length);
|
|
|
1b6f66 |
@@ -8115,12 +8117,14 @@ ssl3_HandleClientHello(sslSocket *ss, SS
|
|
|
1b6f66 |
}
|
|
|
1b6f66 |
ss->ssl3.hs.preliminaryInfo |= ssl_preinfo_version;
|
|
|
1b6f66 |
|
|
|
1b6f66 |
+#ifdef notdef
|
|
|
1b6f66 |
rv = ssl3_InitHandshakeHashes(ss);
|
|
|
1b6f66 |
if (rv != SECSuccess) {
|
|
|
1b6f66 |
desc = internal_error;
|
|
|
1b6f66 |
errCode = PORT_GetError();
|
|
|
1b6f66 |
goto alert_loser;
|
|
|
1b6f66 |
}
|
|
|
1b6f66 |
+#endif
|
|
|
1b6f66 |
|
|
|
1b6f66 |
/* grab the client random data. */
|
|
|
1b6f66 |
rv = ssl3_ConsumeHandshake(
|
|
|
1b6f66 |
@@ -8941,12 +8945,14 @@ ssl3_HandleV2ClientHello(sslSocket *ss,
|
|
|
1b6f66 |
}
|
|
|
1b6f66 |
ss->ssl3.hs.preliminaryInfo |= ssl_preinfo_version;
|
|
|
1b6f66 |
|
|
|
1b6f66 |
+#ifdef notdef
|
|
|
1b6f66 |
rv = ssl3_InitHandshakeHashes(ss);
|
|
|
1b6f66 |
if (rv != SECSuccess) {
|
|
|
1b6f66 |
desc = internal_error;
|
|
|
1b6f66 |
errCode = PORT_GetError();
|
|
|
1b6f66 |
goto alert_loser;
|
|
|
1b6f66 |
}
|
|
|
1b6f66 |
+#endif
|
|
|
1b6f66 |
|
|
|
1b6f66 |
/* if we get a non-zero SID, just ignore it. */
|
|
|
1b6f66 |
if (length !=
|