aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection_or.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-06-17 15:04:29 -0400
committerNick Mathewson <nickm@torproject.org>2011-06-17 15:04:29 -0400
commit31b9b1a5bb3d3fb60e39f5a789ee4fbc2009f6a4 (patch)
treeec0e8783bbf74a2a2f309ac1ba9937ac24009b96 /src/or/connection_or.c
parenta857f61e278aa5e5980722f9d458424b8790e9b1 (diff)
parent209229f100d20958d0826d4f6773d7f6b3a43ade (diff)
downloadtor-31b9b1a5bb3d3fb60e39f5a789ee4fbc2009f6a4.tar.gz
tor-31b9b1a5bb3d3fb60e39f5a789ee4fbc2009f6a4.zip
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/connection_or.c')
-rw-r--r--src/or/connection_or.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 2140e00803..679500deef 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -997,13 +997,16 @@ connection_tls_continue_handshake(or_connection_t *conn)
if (! tor_tls_used_v1_handshake(conn->tls)) {
if (!tor_tls_is_server(conn->tls)) {
if (conn->_base.state == OR_CONN_STATE_TLS_HANDSHAKING) {
- // log_notice(LD_OR,"Done. state was TLS_HANDSHAKING.");
+ log_debug(LD_OR, "Done with initial SSL handshake (client-side). "
+ "Requesting renegotiation.");
conn->_base.state = OR_CONN_STATE_TLS_CLIENT_RENEGOTIATING;
goto again;
}
// log_notice(LD_OR,"Done. state was %d.", conn->_base.state);
} else {
/* improved handshake, but not a client. */
+ log_debug(LD_OR, "Done with initial SSL handshake (server-side). "
+ "Expecting renegotiation.");
tor_tls_set_renegotiate_callback(conn->tls,
connection_or_tls_renegotiated_cb,
conn);