commit 57d10cbe861a235dd269c74fb2fe248469ecee9d
author markus@openbsd.org <markus@openbsd.org> Mon Jan 19 20:16:15 2015 +0000
committer Damien Miller <djm@mindrot.org> Tue Jan 20 09:19:39 2015 +1100
tree c65deed24700490bd3b20300c4829d4d5466ff6d
parent 3fdc88a0def4f86aa88a5846ac079dc964c0546a

upstream commit

adapt kex to sshbuf and struct ssh; ok djm@

serverloop.c

diff --git a/serverloop.c b/serverloop.c
index edf6a81..83a1e01 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: serverloop.c,v 1.174 2015/01/19 20:07:45 markus Exp $ */
+/* $OpenBSD: serverloop.c,v 1.175 2015/01/19 20:16:15 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -544,7 +544,7 @@
 static void
 process_buffered_input_packets(void)
 {
-	dispatch_run(DISPATCH_NONBLOCK, NULL, compat20 ? active_state->kex : NULL);
+	dispatch_run(DISPATCH_NONBLOCK, NULL, active_state);
 }
 
 /*
@@ -874,7 +874,7 @@
 			if (packet_need_rekeying()) {
 				debug("need rekeying");
 				active_state->kex->done = 0;
-				kex_send_kexinit(active_state->kex);
+				kex_send_kexinit(active_state);
 			}
 		}
 		process_input(readset);