1 files changed, 16 insertions, 0 deletions

diff --git a/kex.c b/kex.c
index 54bd1a438..1ec278245 100644
--- a/kex.c
+++ b/kex.c
@@ -50,6 +50,10 @@
 #include "monitor.h"
 #include "roaming.h"
 
+#ifdef GSSAPI
+#include "ssh-gss.h"
+#endif
+
 #if OPENSSL_VERSION_NUMBER >= 0x00907000L
 # if defined(HAVE_EVP_SHA256)
 # define evp_ssh_sha256 EVP_sha256
@@ -82,6 +86,14 @@ static const struct kexalg kexalgs[] = {
 #endif
         { NULL, -1, -1, NULL},
 };
+static const struct kexalg kexalg_prefixes[] = {
+#ifdef GSSAPI
+        { KEX_GSS_GEX_SHA1_ID, KEX_GSS_GEX_SHA1, 0, EVP_sha1 },
+        { KEX_GSS_GRP1_SHA1_ID, KEX_GSS_GRP1_SHA1, 0, EVP_sha1 },
+        { KEX_GSS_GRP14_SHA1_ID, KEX_GSS_GRP14_SHA1, 0, EVP_sha1 },
+#endif
+        { NULL, -1, -1, NULL },
+};
 
 char *
 kex_alg_list(void)
@@ -110,6 +122,10 @@ kex_alg_by_name(const char *name)
                 if (strcmp(k->name, name) == 0)
                         return k;
         }
+        for (k = kexalg_prefixes; k->name != NULL; k++) {
+                if (strncmp(k->name, name, strlen(k->name)) == 0)
+                        return k;
+        }
         return NULL;
 }