summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-12-06 19:49:20 -0500
committerNick Mathewson <nickm@torproject.org>2011-12-06 19:49:20 -0500
commitacc1806eb85b9bb3b6afdb4b6b489b5e23b97d94 (patch)
tree5ac92a8f7caa1df4da4c8ff55123f0740eabac4d
parent75134c6c86e54c10fd9e11c4345aadcdabc0f8fb (diff)
downloadtor-acc1806eb85b9bb3b6afdb4b6b489b5e23b97d94.tar.gz
tor-acc1806eb85b9bb3b6afdb4b6b489b5e23b97d94.zip
Revert "Don't schedule excess_renegotiations_callback unless it's set"
This reverts commit 617617e21a2d30a86cea9c8f7043333078f2e8f8.
-rw-r--r--src/common/tortls.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c
index 9ac5c34f26..9a77bab09c 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1333,8 +1333,7 @@ tor_tls_got_client_hello(tor_tls_t *tls)
}
tls->got_renegotiate = 1;
- } else if (tls->server_handshake_count > 2 &&
- tls->excess_renegotiations_callback) {
+ } else if (tls->server_handshake_count > 2) {
/* 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