summaryrefslogtreecommitdiff
path: root/src/or/connection_or.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-11-25 09:12:50 -0500
committerNick Mathewson <nickm@torproject.org>2015-11-25 09:17:44 -0500
commitdce708d11c4ec94ece2fd49b6b697df759f93ef1 (patch)
tree4e1c8aeb649183d2b3805f8375cb402adba0a8ca /src/or/connection_or.c
parent45caeec9a03d7caca13ef4d6caeda23f7bb3129e (diff)
downloadtor-dce708d11c4ec94ece2fd49b6b697df759f93ef1.tar.gz
tor-dce708d11c4ec94ece2fd49b6b697df759f93ef1.zip
Fix a logic error in connection_tls_continue_handshake().
(If we take the branch above this assertion, than we *didn't* have a v1 handshake. So if we don't take the branch, we did. So if we reach this assertion, we must be running as a server, since clients no longer attempt v1 handshakes.) Fix for bug 17654; bugfix on 9d019a7db725dca3dfdbf8d4dbc3b51835e0b49e. Bug not in any released Tor.
Diffstat (limited to 'src/or/connection_or.c')
-rw-r--r--src/or/connection_or.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 59dea37abd..08962bd4db 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1480,7 +1480,7 @@ connection_tls_continue_handshake(or_connection_t *conn)
return 0;
}
}
- tor_assert(!tor_tls_is_server(conn->tls));
+ tor_assert(tor_tls_is_server(conn->tls));
return connection_tls_finish_handshake(conn);
case TOR_TLS_WANTWRITE:
connection_start_writing(TO_CONN(conn));