|
@@ -871,12 +871,12 @@ connection_tls_start_handshake(or_connection_t *conn, int receiving)
|
|
{
|
|
{
|
|
conn->_base.state = OR_CONN_STATE_TLS_HANDSHAKING;
|
|
conn->_base.state = OR_CONN_STATE_TLS_HANDSHAKING;
|
|
conn->tls = tor_tls_new(conn->_base.s, receiving);
|
|
conn->tls = tor_tls_new(conn->_base.s, receiving);
|
|
- tor_tls_set_logged_address(conn->tls, // XXX client and relay?
|
|
|
|
- escaped_safe_str(conn->_base.address));
|
|
|
|
if (!conn->tls) {
|
|
if (!conn->tls) {
|
|
log_warn(LD_BUG,"tor_tls_new failed. Closing.");
|
|
log_warn(LD_BUG,"tor_tls_new failed. Closing.");
|
|
return -1;
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
+ tor_tls_set_logged_address(conn->tls, // XXX client and relay?
|
|
|
|
+ escaped_safe_str(conn->_base.address));
|
|
connection_start_reading(TO_CONN(conn));
|
|
connection_start_reading(TO_CONN(conn));
|
|
log_debug(LD_HANDSHAKE,"starting TLS handshake on fd %d", conn->_base.s);
|
|
log_debug(LD_HANDSHAKE,"starting TLS handshake on fd %d", conn->_base.s);
|
|
note_crypto_pk_op(receiving ? TLS_HANDSHAKE_S : TLS_HANDSHAKE_C);
|
|
note_crypto_pk_op(receiving ? TLS_HANDSHAKE_S : TLS_HANDSHAKE_C);
|