aboutsummaryrefslogtreecommitdiff
path: root/src/or/channeltls.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-08-21 10:10:35 -0400
committerNick Mathewson <nickm@torproject.org>2013-08-21 11:29:19 -0400
commitcbc53a2d52a67e49e56ad9d8f5334ad623a59374 (patch)
tree78ad46a446f28c1a6d9ae74fb84bc9ac00d3d0d5 /src/or/channeltls.c
parent1bb4a4f9bdf24706a459e4aefb2b0fb75622f7ac (diff)
downloadtor-cbc53a2d52a67e49e56ad9d8f5334ad623a59374.tar
tor-cbc53a2d52a67e49e56ad9d8f5334ad623a59374.tar.gz
Make bridges send AUTH_CHALLENGE cells
The spec requires them to do so, and not doing so creates a situation where they can't send-test because relays won't extend to them because of the other part of bug 9546. Fixes bug 9546; bugfix on 0.2.3.6-alpha.
Diffstat (limited to 'src/or/channeltls.c')
-rw-r--r--src/or/channeltls.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index a7953e7a8..f751c0da9 100644
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@ -1262,8 +1262,8 @@ channel_tls_process_versions_cell(var_cell_t *cell, channel_tls_t *chan)
const int send_versions = !started_here;
/* If we want to authenticate, send a CERTS cell */
const int send_certs = !started_here || public_server_mode(get_options());
- /* If we're a relay that got a connection, ask for authentication. */
- const int send_chall = !started_here && public_server_mode(get_options());
+ /* If we're a host that got a connection, ask for authentication. */
+ const int send_chall = !started_here;
/* If our certs cell will authenticate us, we can send a netinfo cell
* right now. */
const int send_netinfo = !started_here;