commit 2ae666a8fc20b3b871b2f1b90ad65cc027336ccd
author markus@openbsd.org <markus@openbsd.org> Tue May 30 14:23:52 2017 +0000
committer Damien Miller <djm@mindrot.org> Wed May 31 10:50:05 2017 +1000
tree f13f1c949ae60c16160acebbfb680c3dc7b13fe5
parent 94583beb24a6c5fd19cedb9104ab2d2d5cd052b6

upstream commit

protocol handlers all get struct ssh passed; ok djm@

Upstream-ID: 0ca9ea2a5d01a6d2ded94c5024456a930c5bfb5d

kexdhc.c

diff --git a/kexdhc.c b/kexdhc.c
index ad3975f..9864ee2 100644
--- a/kexdhc.c
+++ b/kexdhc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexdhc.c,v 1.19 2016/05/02 10:26:04 djm Exp $ */
+/* $OpenBSD: kexdhc.c,v 1.20 2017/05/30 14:23:52 markus Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -49,7 +49,7 @@
 #include "ssherr.h"
 #include "sshbuf.h"
 
-static int input_kex_dh(int, u_int32_t, void *);
+static int input_kex_dh(int, u_int32_t, struct ssh *);
 
 int
 kexdh_client(struct ssh *ssh)
@@ -100,9 +100,8 @@
 }
 
 static int
-input_kex_dh(int type, u_int32_t seq, void *ctxt)
+input_kex_dh(int type, u_int32_t seq, struct ssh *ssh)
 {
-	struct ssh *ssh = ctxt;
 	struct kex *kex = ssh->kex;
 	BIGNUM *dh_server_pub = NULL, *shared_secret = NULL;
 	struct sshkey *server_host_key = NULL;