upstream commit

protocol handlers all get struct ssh passed; ok djm@

Upstream-ID: 0ca9ea2a5d01a6d2ded94c5024456a930c5bfb5d

1 files changed, 31 insertions, 41 deletions

diff --git a/sshconnect2.c b/sshconnect2.c
index affc5667f..dab905b58 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.260 2017/05/30 14:19:15 markus Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.261 2017/05/30 14:23:52 markus Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -287,16 +287,16 @@ struct cauthmethod {
         int     *batch_flag;    /* flag in option struct that disables method */
 };
 
-int     input_userauth_service_accept(int, u_int32_t, void *);
-int     input_userauth_ext_info(int, u_int32_t, void *);
-int     input_userauth_success(int, u_int32_t, void *);
-int     input_userauth_success_unexpected(int, u_int32_t, void *);
-int     input_userauth_failure(int, u_int32_t, void *);
-int     input_userauth_banner(int, u_int32_t, void *);
-int     input_userauth_error(int, u_int32_t, void *);
-int     input_userauth_info_req(int, u_int32_t, void *);
-int     input_userauth_pk_ok(int, u_int32_t, void *);
-int     input_userauth_passwd_changereq(int, u_int32_t, void *);
+int     input_userauth_service_accept(int, u_int32_t, struct ssh *);
+int     input_userauth_ext_info(int, u_int32_t, struct ssh *);
+int     input_userauth_success(int, u_int32_t, struct ssh *);
+int     input_userauth_success_unexpected(int, u_int32_t, struct ssh *);
+int     input_userauth_failure(int, u_int32_t, struct ssh *);
+int     input_userauth_banner(int, u_int32_t, struct ssh *);
+int     input_userauth_error(int, u_int32_t, struct ssh *);
+int     input_userauth_info_req(int, u_int32_t, struct ssh *);
+int     input_userauth_pk_ok(int, u_int32_t, struct ssh *);
+int     input_userauth_passwd_changereq(int, u_int32_t, struct ssh *);
 
 int     userauth_none(Authctxt *);
 int     userauth_pubkey(Authctxt *);
@@ -306,11 +306,11 @@ int	userauth_hostbased(Authctxt *);
 
 #ifdef GSSAPI
 int     userauth_gssapi(Authctxt *authctxt);
-int     input_gssapi_response(int type, u_int32_t, void *);
-int     input_gssapi_token(int type, u_int32_t, void *);
-int     input_gssapi_hash(int type, u_int32_t, void *);
-int     input_gssapi_error(int, u_int32_t, void *);
-int     input_gssapi_errtok(int, u_int32_t, void *);
+int     input_gssapi_response(int type, u_int32_t, struct ssh *);
+int     input_gssapi_token(int type, u_int32_t, struct ssh *);
+int     input_gssapi_hash(int type, u_int32_t, struct ssh *);
+int     input_gssapi_error(int, u_int32_t, struct ssh *);
+int     input_gssapi_errtok(int, u_int32_t, struct ssh *);
 #endif
 
 void    userauth(Authctxt *, char *);
@@ -414,9 +414,8 @@ ssh_userauth2(const char *local_user, const char *server_user, char *host,
 
 /* ARGSUSED */
 int
-input_userauth_service_accept(int type, u_int32_t seqnr, void *ctxt)
+input_userauth_service_accept(int type, u_int32_t seq, struct ssh *ssh)
 {
-        struct ssh *ssh = ctxt;
         Authctxt *authctxt = ssh->authctxt;
         int r;
 
@@ -448,9 +447,9 @@ input_userauth_service_accept(int type, u_int32_t seqnr, void *ctxt)
 
 /* ARGSUSED */
 int
-input_userauth_ext_info(int type, u_int32_t seqnr, void *ctxt)
+input_userauth_ext_info(int type, u_int32_t seqnr, struct ssh *ssh)
 {
-        return kex_input_ext_info(type, seqnr, ctxt);
+        return kex_input_ext_info(type, seqnr, ssh);
 }
 
 void
@@ -490,7 +489,7 @@ userauth(Authctxt *authctxt, char *authlist)
 
 /* ARGSUSED */
 int
-input_userauth_error(int type, u_int32_t seq, void *ctxt)
+input_userauth_error(int type, u_int32_t seq, struct ssh *ssh)
 {
         fatal("input_userauth_error: bad message during authentication: "
             "type %d", type);
@@ -499,7 +498,7 @@ input_userauth_error(int type, u_int32_t seq, void *ctxt)
 
 /* ARGSUSED */
 int
-input_userauth_banner(int type, u_int32_t seq, void *ctxt)
+input_userauth_banner(int type, u_int32_t seq, struct ssh *ssh)
 {
         char *msg, *lang;
         u_int len;
@@ -516,9 +515,8 @@ input_userauth_banner(int type, u_int32_t seq, void *ctxt)
 
 /* ARGSUSED */
 int
-input_userauth_success(int type, u_int32_t seq, void *ctxt)
+input_userauth_success(int type, u_int32_t seq, struct ssh *ssh)
 {
-        struct ssh *ssh = ctxt;
         Authctxt *authctxt = ssh->authctxt;
 
         if (authctxt == NULL)
@@ -534,9 +532,8 @@ input_userauth_success(int type, u_int32_t seq, void *ctxt)
 }
 
 int
-input_userauth_success_unexpected(int type, u_int32_t seq, void *ctxt)
+input_userauth_success_unexpected(int type, u_int32_t seq, struct ssh *ssh)
 {
-        struct ssh *ssh = ctxt;
         Authctxt *authctxt = ssh->authctxt;
 
         if (authctxt == NULL)
@@ -549,9 +546,8 @@ input_userauth_success_unexpected(int type, u_int32_t seq, void *ctxt)
 
 /* ARGSUSED */
 int
-input_userauth_failure(int type, u_int32_t seq, void *ctxt)
+input_userauth_failure(int type, u_int32_t seq, struct ssh *ssh)
 {
-        struct ssh *ssh = ctxt;
         Authctxt *authctxt = ssh->authctxt;
         char *authlist = NULL;
         int partial;
@@ -576,9 +572,8 @@ input_userauth_failure(int type, u_int32_t seq, void *ctxt)
 
 /* ARGSUSED */
 int
-input_userauth_pk_ok(int type, u_int32_t seq, void *ctxt)
+input_userauth_pk_ok(int type, u_int32_t seq, struct ssh *ssh)
 {
-        struct ssh *ssh = ctxt;
         Authctxt *authctxt = ssh->authctxt;
         struct sshkey *key = NULL;
         Identity *id = NULL;
@@ -764,9 +759,8 @@ process_gssapi_token(void *ctxt, gss_buffer_t recv_tok)
 
 /* ARGSUSED */
 int
-input_gssapi_response(int type, u_int32_t plen, void *ctxt)
+input_gssapi_response(int type, u_int32_t plen, struct ssh *ssh)
 {
-        struct ssh *ssh = ctxt;
         Authctxt *authctxt = ssh->authctxt;
         Gssctxt *gssctxt;
         int oidlen;
@@ -806,9 +800,8 @@ input_gssapi_response(int type, u_int32_t plen, void *ctxt)
 
 /* ARGSUSED */
 int
-input_gssapi_token(int type, u_int32_t plen, void *ctxt)
+input_gssapi_token(int type, u_int32_t plen, struct ssh *ssh)
 {
-        struct ssh *ssh = ctxt;
         Authctxt *authctxt = ssh->authctxt;
         gss_buffer_desc recv_tok;
         OM_uint32 status;
@@ -836,9 +829,8 @@ input_gssapi_token(int type, u_int32_t plen, void *ctxt)
 
 /* ARGSUSED */
 int
-input_gssapi_errtok(int type, u_int32_t plen, void *ctxt)
+input_gssapi_errtok(int type, u_int32_t plen, struct ssh *ssh)
 {
-        struct ssh *ssh = ctxt;
         Authctxt *authctxt = ssh->authctxt;
         Gssctxt *gssctxt;
         gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
@@ -868,7 +860,7 @@ input_gssapi_errtok(int type, u_int32_t plen, void *ctxt)
 
 /* ARGSUSED */
 int
-input_gssapi_error(int type, u_int32_t plen, void *ctxt)
+input_gssapi_error(int type, u_int32_t plen, struct ssh *ssh)
 {
         char *msg;
         char *lang;
@@ -939,9 +931,8 @@ userauth_passwd(Authctxt *authctxt)
  */
 /* ARGSUSED */
 int
-input_userauth_passwd_changereq(int type, u_int32_t seqnr, void *ctxt)
+input_userauth_passwd_changereq(int type, u_int32_t seqnr, struct ssh *ssh)
 {
-        struct ssh *ssh = ctxt;
         Authctxt *authctxt = ssh->authctxt;
         char *info, *lang, *password = NULL, *retype = NULL;
         char prompt[150];
@@ -1570,9 +1561,8 @@ userauth_kbdint(Authctxt *authctxt)
  * parse INFO_REQUEST, prompt user and send INFO_RESPONSE
  */
 int
-input_userauth_info_req(int type, u_int32_t seq, void *ctxt)
+input_userauth_info_req(int type, u_int32_t seq, struct ssh *ssh)
 {
-        struct ssh *ssh = ctxt;
         Authctxt *authctxt = ssh->authctxt;
         char *name, *inst, *lang, *prompt, *response;
         u_int num_prompts, i;