24 lines
872 B
Diff
24 lines
872 B
Diff
|
Index: mozilla/security/nss/lib/ssl/ssl3con.c
|
||
|
|
===================================================================
|
||
|
|
RCS file: /cvsroot/mozilla/security/nss/lib/ssl/ssl3con.c,v
|
||
|
|
retrieving revision 1.121
|
||
|
|
diff -u -p -r1.121 ssl3con.c
|
||
|
|
--- mozilla/security/nss/lib/ssl/ssl3con.c 12 Nov 2009 05:08:27 -0000 1.121
|
||
|
|
+++ mozilla/security/nss/lib/ssl/ssl3con.c 20 Nov 2009 19:36:30 -0000
|
||
|
|
@@ -4004,6 +4004,7 @@ ssl3_HandleHelloRequest(sslSocket *ss)
|
||
|
|
PORT_SetError(SSL_ERROR_RX_UNEXPECTED_HELLO_REQUEST);
|
||
|
|
return SECFailure;
|
||
|
|
}
|
||
|
|
+ /*
|
||
|
|
if (ss->opt.enableRenegotiation == SSL_RENEGOTIATE_NEVER) {
|
||
|
|
ssl_GetXmitBufLock(ss);
|
||
|
|
rv = SSL3_SendAlert(ss, alert_warning, no_renegotiation);
|
||
|
|
@@ -4011,6 +4012,7 @@ ssl3_HandleHelloRequest(sslSocket *ss)
|
||
|
|
PORT_SetError(SSL_ERROR_RENEGOTIATION_NOT_ALLOWED);
|
||
|
|
return SECFailure;
|
||
|
|
}
|
||
|
|
+ */
|
||
|
|
|
||
|
|
if (sid) {
|
||
|
|
ss->sec.uncache(sid);
|