From 3fdc88a0def4f86aa88a5846ac079dc964c0546a Mon Sep 17 00:00:00 2001 From: "markus@openbsd.org" Date: Mon, 19 Jan 2015 20:07:45 +0000 Subject: upstream commit move dispatch to struct ssh; ok djm@ --- kex.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'kex.c') diff --git a/kex.c b/kex.c index 7c4dd7a90..92ebaf732 100644 --- a/kex.c +++ b/kex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kex.c,v 1.100 2015/01/19 19:52:16 markus Exp $ */ +/* $OpenBSD: kex.c,v 1.101 2015/01/19 20:07:45 markus Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * @@ -209,10 +209,11 @@ kex_prop_free(char **proposal) } /* ARGSUSED */ -static void +static int kex_protocol_error(int type, u_int32_t seq, void *ctxt) { error("Hm, kex protocol error: type %d seq %u", type, seq); + return 0; } static void @@ -281,7 +282,7 @@ kex_send_kexinit(Kex *kex) } /* ARGSUSED */ -void +int kex_input_kexinit(int type, u_int32_t seq, void *ctxt) { const char *ptr; @@ -316,6 +317,7 @@ kex_input_kexinit(int type, u_int32_t seq, void *ctxt) packet_check_eom(); kex_kexinit_finish(kex); + return 0; } void -- cgit v1.2.3