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.

Author: Simon Wilkinson <simon@sxw.org.uk>
Author: Colin Watson <cjwatson@debian.org>
Author: Jakub Jelen <jjelen@redhat.com>
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-06-07

Patch-Name: gssapi.patch

1 files changed, 2 insertions, 1 deletions

diff --git a/sshkey.c b/sshkey.c
index ac451f1a8..b88282e19 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -156,6 +156,7 @@ static const struct keytype keytypes[] = {
             KEY_ECDSA_SK_CERT, NID_X9_62_prime256v1, 1, 0 },
 # endif /* OPENSSL_HAS_ECC */
 #endif /* WITH_OPENSSL */
+        { "null", "null", NULL, KEY_NULL, 0, 0, 0 },
         { NULL, NULL, NULL, -1, -1, 0, 0 }
 };
 
@@ -257,7 +258,7 @@ sshkey_alg_list(int certs_only, int plain_only, int include_sigonly, char sep)
         const struct keytype *kt;
 
         for (kt = keytypes; kt->type != -1; kt++) {
-                if (kt->name == NULL)
+                if (kt->name == NULL || kt->type == KEY_NULL)
                         continue;
                 if (!include_sigonly && kt->sigonly)
                         continue;