From 021ff31ba6c303ebf13e12e691ea74ca4b39a693 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 6 Dec 2011 19:49:21 -0500 Subject: Revert "Get rid of tor_tls_block_renegotiation()." This reverts commit 340809dd224b244675496e301d3ba154a6fe68d0. --- src/or/connection_or.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/or/connection_or.c') diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 992db9a40c..cbe678d6cf 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1149,6 +1149,10 @@ connection_or_tls_renegotiated_cb(tor_tls_t *tls, void *_conn) or_connection_t *conn = _conn; (void)tls; + /* Don't invoke this again. */ + tor_tls_set_renegotiate_callback(tls, NULL, NULL); + tor_tls_block_renegotiation(tls); + if (connection_tls_finish_handshake(conn) < 0) { /* XXXX_TLS double-check that it's ok to do this from inside read. */ /* XXXX_TLS double-check that this verifies certificates. */ @@ -1537,6 +1541,7 @@ connection_tls_finish_handshake(or_connection_t *conn) connection_or_init_conn_from_address(conn, &conn->_base.addr, conn->_base.port, digest_rcvd, 0); } + tor_tls_block_renegotiation(conn->tls); return connection_or_set_state_open(conn); } else { conn->_base.state = OR_CONN_STATE_OR_HANDSHAKING_V2; -- cgit v1.2.3-54-g00ecf