1 files changed, 17 insertions, 19 deletions

diff --git a/monitor_wrap.c b/monitor_wrap.c
index fd4d7eb3b..6b3a6251c 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_wrap.c,v 1.107 2018/07/20 03:46:34 djm Exp $ */
+/* $OpenBSD: monitor_wrap.c,v 1.112 2019/01/21 09:54:11 djm Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -202,12 +202,8 @@ mm_choose_dh(int min, int nbits, int max)
         if (success == 0)
                 fatal("%s: MONITOR_ANS_MODULI failed", __func__);
 
-        if ((p = BN_new()) == NULL)
-                fatal("%s: BN_new failed", __func__);
-        if ((g = BN_new()) == NULL)
-                fatal("%s: BN_new failed", __func__);
-        if ((r = sshbuf_get_bignum2(m, p)) != 0 ||
-            (r = sshbuf_get_bignum2(m, g)) != 0)
+        if ((r = sshbuf_get_bignum2(m, &p)) != 0 ||
+            (r = sshbuf_get_bignum2(m, &g)) != 0)
                 fatal("%s: buffer error: %s", __func__, ssh_err(r));
 
         debug3("%s: remaining %zu", __func__, sshbuf_len(m));
@@ -218,12 +214,12 @@ mm_choose_dh(int min, int nbits, int max)
 #endif
 
 int
-mm_sshkey_sign(struct sshkey *key, u_char **sigp, size_t *lenp,
+mm_sshkey_sign(struct ssh *ssh, struct sshkey *key, u_char **sigp, size_t *lenp,
     const u_char *data, size_t datalen, const char *hostkey_alg, u_int compat)
 {
         struct kex *kex = *pmonitor->m_pkex;
         struct sshbuf *m;
-        u_int ndx = kex->host_key_index(key, 0, active_state);
+        u_int ndx = kex->host_key_index(key, 0, ssh);
         int r;
 
         debug3("%s entering", __func__);
@@ -248,9 +244,8 @@ mm_sshkey_sign(struct sshkey *key, u_char **sigp, size_t *lenp,
 }
 
 struct passwd *
-mm_getpwnamallow(const char *username)
+mm_getpwnamallow(struct ssh *ssh, const char *username)
 {
-        struct ssh *ssh = active_state;         /* XXX */
         struct sshbuf *m;
         struct passwd *pw;
         size_t len;
@@ -459,8 +454,8 @@ mm_user_key_allowed(struct ssh *ssh, struct passwd *pw, struct sshkey *key,
 }
 
 int
-mm_hostbased_key_allowed(struct passwd *pw, const char *user, const char *host,
-    struct sshkey *key)
+mm_hostbased_key_allowed(struct ssh *ssh, struct passwd *pw,
+    const char *user, const char *host, struct sshkey *key)
 {
         return (mm_key_allowed(MM_HOSTKEY, user, host, key, 0, NULL));
 }
@@ -553,9 +548,8 @@ mm_sshkey_verify(const struct sshkey *key, const u_char *sig, size_t siglen,
 }
 
 void
-mm_send_keystate(struct monitor *monitor)
+mm_send_keystate(struct ssh *ssh, struct monitor *monitor)
 {
-        struct ssh *ssh = active_state;         /* XXX */
         struct sshbuf *m;
         int r;
 
@@ -649,7 +643,7 @@ mm_session_pty_cleanup2(Session *s)
 
 #ifdef USE_PAM
 void
-mm_start_pam(Authctxt *authctxt)
+mm_start_pam(struct ssh *ssh)
 {
         struct sshbuf *m;
 
@@ -890,7 +884,7 @@ mm_bsdauth_respond(void *ctx, u_int numresponses, char **responses)
 
 #ifdef SSH_AUDIT_EVENTS
 void
-mm_audit_event(ssh_audit_event_t event)
+mm_audit_event(struct ssh *ssh, ssh_audit_event_t event)
 {
         struct sshbuf *m;
         int r;
@@ -1005,13 +999,15 @@ mm_ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
 }
 
 int
-mm_ssh_gssapi_userok(char *user, struct passwd *pw)
+mm_ssh_gssapi_userok(char *user, struct passwd *pw, int kex)
 {
         struct sshbuf *m;
         int r, authenticated = 0;
 
         if ((m = sshbuf_new()) == NULL)
                 fatal("%s: sshbuf_new failed", __func__);
+        if ((r = sshbuf_put_u32(m, kex)) != 0)
+                fatal("%s: buffer error: %s", __func__, ssh_err(r));
 
         mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSUSEROK, m);
         mm_request_receive_expect(pmonitor->m_recvfd,
@@ -1046,7 +1042,7 @@ mm_ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *data, gss_buffer_desc *hash)
 
         sshbuf_free(m);
 
-        return(major);
+        return (major);
 }
 
 int
@@ -1057,6 +1053,7 @@ mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *store)
 
         if ((m = sshbuf_new()) == NULL)
                 fatal("%s: sshbuf_new failed", __func__);
+
         if ((r = sshbuf_put_cstring(m,
             store->filename ? store->filename : "")) != 0 ||
             (r = sshbuf_put_cstring(m,
@@ -1070,6 +1067,7 @@ mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *store)
 
         if ((r = sshbuf_get_u32(m, &ok)) != 0)
                 fatal("%s: buffer error: %s", __func__, ssh_err(r));
+
         sshbuf_free(m);
 
         return (ok);