diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-10-07 10:10:08 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-10-07 10:13:39 -0400 |
| commit | 6505d529a5cc669ee723d818a614fe7663e5c0ea (patch) | |
| tree | 101a15213cc6ba402df85569f47482a345fbef97 /src/or/connection_or.c | |
| parent | 2ad6e1bb0eeec88e8a2580a9b33a5dbadc995ba2 (diff) | |
| download | tor-6505d529a5cc669ee723d818a614fe7663e5c0ea.tar.gz tor-6505d529a5cc669ee723d818a614fe7663e5c0ea.zip | |
Remove client-side support for detecting v1 handshake
Fixes more of 11150
Diffstat (limited to 'src/or/connection_or.c')
| -rw-r--r-- | src/or/connection_or.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 8e12aa0cea..c08dc4bd12 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1783,11 +1783,10 @@ connection_tls_finish_handshake(or_connection_t *conn) circuit_build_times_network_is_live(get_circuit_build_times_mutable()); if (tor_tls_used_v1_handshake(conn->tls)) { + tor_assert(!started_here); conn->link_proto = 1; - if (!started_here) { - connection_or_init_conn_from_address(conn, &conn->base_.addr, - conn->base_.port, digest_rcvd, 0); - } + connection_or_init_conn_from_address(conn, &conn->base_.addr, + conn->base_.port, digest_rcvd, 0); tor_tls_block_renegotiation(conn->tls); rep_hist_note_negotiated_link_proto(1, started_here); return connection_or_set_state_open(conn); |