diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-05-02 19:18:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-02 19:18:04 -0400 |
| commit | 7bc9f93abbfcabba1acde441b5fac98d4676c08e (patch) | |
| tree | fb81ff00f65a99dd7a669f3f9ab5c0ce02bae542 /src/or/channeltls.c | |
| parent | a91f948ccac5e681de9e8e63efb267c7ad9e9f5f (diff) | |
| parent | f9af7e8bd01d4b7a70776a96c649a89cf1717dd1 (diff) | |
| download | tor-7bc9f93abbfcabba1acde441b5fac98d4676c08e.tar.gz tor-7bc9f93abbfcabba1acde441b5fac98d4676c08e.zip | |
Merge branch 'teor_connection-with-client-v2_squashed'
Diffstat (limited to 'src/or/channeltls.c')
| -rw-r--r-- | src/or/channeltls.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 9d9e7446ab..7c4dc9aa09 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1654,6 +1654,10 @@ channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *chan) tor_assert(tor_mem_is_zero( (const char*)(chan->conn->handshake_state-> authenticated_ed25519_peer_id.pubkey), 32)); + /* If the client never authenticated, it's a tor client or bridge + * relay, and we must not use it for EXTEND requests (nor could we, as + * there are no authenticated peer IDs) */ + channel_mark_client(TLS_CHAN_TO_BASE(chan)); channel_set_circid_type(TLS_CHAN_TO_BASE(chan), NULL, chan->conn->link_proto < MIN_LINK_PROTO_FOR_WIDE_CIRC_IDS); |