From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 25 Nov 2015 14:12:50 +0000 (-0500)
Subject: Fix a logic error in connection_tls_continue_handshake().
X-Git-Tag: tor-0.2.8.1-alpha~212^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dce708d11c4ec94ece2fd49b6b697df759f93ef1;p=thirdparty%2Ftor.git

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.
---

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));