From 7f42096d0fb56c54768f16e93666f8ee420a5424 Mon Sep 17 00:00:00 2001 From: Matt Johnston Date: Thu, 4 Apr 2013 00:18:50 +0800 Subject: Take transmit and receive keys into use separately --- cli-session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cli-session.c') diff --git a/cli-session.c b/cli-session.c index 7adea26..9639ffa 100644 --- a/cli-session.c +++ b/cli-session.c @@ -204,8 +204,7 @@ static void cli_sessionloop() { } /* A KEX has finished, so we should go back to our KEX_NOTHING state */ - if (cli_ses.kex_state != KEX_NOTHING && ses.kexstate.recvkexinit == 0 - && ses.kexstate.sentkexinit == 0) { + if (cli_ses.kex_state != KEX_NOTHING && ses.kexstate.sentnewkeys) { cli_ses.kex_state = KEX_NOTHING; } @@ -218,6 +217,7 @@ static void cli_sessionloop() { if (ses.kexstate.donefirstkex == 0) { /* We might reach here if we have partial packet reads or have * received SSG_MSG_IGNORE etc. Just skip it */ + TRACE2(("donefirstkex false\n")) return; } -- cgit v1.2.3