[tor-commits] [tor/master] Fix a logic error in connection_tls_continue_handshake().

[nickm at torproject.org]

commit dce708d11c4ec94ece2fd49b6b697df759f93ef1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 25 09:12:50 2015 -0500

    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.
---
 src/or/connection_or.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 59dea37..08962bd 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));