From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 27 Nov 2011 13:21:59 +0000 (-0500)
Subject: Don't schedule excess_renegotiations_callback unless it's set
X-Git-Tag: tor-0.2.3.9-alpha~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=617617e21a2d30a86cea9c8f7043333078f2e8f8;p=thirdparty%2Ftor.git

Don't schedule excess_renegotiations_callback unless it's set

Partial fix for bug 4587; reported by "frosty_un".
---

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 0571b346dd..e052c85eb2 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1318,7 +1318,8 @@ tor_tls_got_client_hello(tor_tls_t *tls)
     }
 
     tls->got_renegotiate = 1;
-  } else if (tls->server_handshake_count > 2) {
+  } else if (tls->server_handshake_count > 2 &&
+             tls->excess_renegotiations_callback) {
     /* We got more than one renegotiation requests. The Tor protocol
        needs just one renegotiation; more than that probably means
        They are trying to DoS us and we have to stop them. We can't