GSSAPI key exchange support

This patch has been rejected upstream: "None of the OpenSSH developers are
in favour of adding this, and this situation has not changed for several
years.  This is not a slight on Simon's patch, which is of fine quality, but
just that a) we don't trust GSSAPI implementations that much and b) we don't
like adding new KEX since they are pre-auth attack surface.  This one is
particularly scary, since it requires hooks out to typically root-owned
system resources."

However, quite a lot of people rely on this in Debian, and it's better to
have it merged into the main openssh package rather than having separate
-krb5 packages (as we used to have).  It seems to have a generally good
security history.

Origin: other, https://github.com/openssh-gsskex/openssh-gsskex/commits/debian/master
Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1242
Last-Updated: 2020-02-21

Patch-Name: gssapi.patch

1 files changed, 56 insertions, 1 deletions

diff --git a/monitor_wrap.c b/monitor_wrap.c
index 001a8fa1c..6edb509a3 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -993,13 +993,15 @@ mm_ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
 }
 
 int
-mm_ssh_gssapi_userok(char *user)
+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,
@@ -1012,4 +1014,57 @@ mm_ssh_gssapi_userok(char *user)
         debug3("%s: user %sauthenticated",__func__, authenticated ? "" : "not ");
         return (authenticated);
 }
+
+OM_uint32
+mm_ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *data, gss_buffer_desc *hash)
+{
+        struct sshbuf *m;
+        OM_uint32 major;
+        int r;
+
+        if ((m = sshbuf_new()) == NULL)
+                fatal("%s: sshbuf_new failed", __func__);
+        if ((r = sshbuf_put_string(m, data->value, data->length)) != 0)
+                fatal("%s: buffer error: %s", __func__, ssh_err(r));
+
+        mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSIGN, m);
+        mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSIGN, m);
+
+        if ((r = sshbuf_get_u32(m, &major)) != 0 ||
+            (r = ssh_gssapi_get_buffer_desc(m, hash)) != 0)
+                fatal("%s: buffer error: %s", __func__, ssh_err(r));
+
+        sshbuf_free(m);
+
+        return (major);
+}
+
+int
+mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *store)
+{
+        struct sshbuf *m;
+        int r, ok;
+
+        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,
+            store->envvar ? store->envvar : "")) != 0 ||
+            (r = sshbuf_put_cstring(m,
+            store->envval ? store->envval : "")) != 0)
+                fatal("%s: buffer error: %s", __func__, ssh_err(r));
+
+        mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSUPCREDS, m);
+        mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSUPCREDS, m);
+
+        if ((r = sshbuf_get_u32(m, &ok)) != 0)
+                fatal("%s: buffer error: %s", __func__, ssh_err(r));
+
+        sshbuf_free(m);
+
+        return (ok);
+}
+
 #endif /* GSSAPI */