upstream commit

one more void *ctx => struct ssh *ssh conversion

Upstream-ID: d299d043471c10214cf52c03daa10f1c232759e2

diff --git a/kexc25519c.c b/kexc25519c.c
index b7ef65dc31aefad7e05020498ad4c18a081825f9..e488013e93cd707505c53460d232ad75a2b60dfd 100644 (file)
--- a/kexc25519c.c
+++ b/kexc25519c.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexc25519c.c,v 1.7 2015/01/26 06:10:03 djm Exp $ */
+/* $OpenBSD: kexc25519c.c,v 1.8 2017/05/31 04:17:12 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2010 Damien Miller.  All rights reserved.
@@ -44,7 +44,7 @@
 #include "ssherr.h"
 
 static int
-input_kex_c25519_reply(int type, u_int32_t seq, void *ctxt);
+input_kex_c25519_reply(int type, u_int32_t seq, struct ssh *ssh);
 
 int
 kexc25519_client(struct ssh *ssh)
@@ -69,9 +69,8 @@ kexc25519_client(struct ssh *ssh)
 }
 
 static int
-input_kex_c25519_reply(int type, u_int32_t seq, void *ctxt)
+input_kex_c25519_reply(int type, u_int32_t seq, struct ssh *ssh)
 {
-       struct ssh *ssh = ctxt;
        struct kex *kex = ssh->kex;
        struct sshkey *server_host_key = NULL;
        struct sshbuf *shared_secret = NULL;