From f88d86e05895671b9d036c26566a41752ec86c31 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Wed, 14 Sep 2005 15:20:11 +0000
Subject: * Add remaining pieces of Kerberos support (closes: #275472):   - Add
 GSSAPI key exchange support from    
 http://www.sxw.org.uk/computing/patches/openssh.html (thanks, Stephen    
 Frost).

---
 kex.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'kex.c')

diff --git a/kex.c b/kex.c
index 5dce335fe..e7147ae74 100644
--- a/kex.c
+++ b/kex.c
@@ -42,6 +42,10 @@ RCSID("$OpenBSD: kex.c,v 1.64 2005/07/25 11:59:39 markus Exp $");
 #include "dispatch.h"
 #include "monitor.h"
 
+#ifdef GSSAPI
+#include "ssh-gss.h"
+#endif
+
 #define KEX_COOKIE_LEN	16
 
 /* prototype */
@@ -298,6 +302,11 @@ choose_kex(Kex *k, char *client, char *server)
 		k->kex_type = KEX_DH_GRP14_SHA1;
 	} else if (strcmp(k->name, KEX_DHGEX) == 0) {
 		k->kex_type = KEX_DH_GEX_SHA1;
+#ifdef GSSAPI
+	} else if (strncmp(k->name, KEX_GSS_SHA1, 
+	    sizeof(KEX_GSS_SHA1)-1) == 0) {
+		k->kex_type = KEX_GSS_GRP1_SHA1;
+#endif
 	} else
 		fatal("bad kex alg %s", k->name);
 }
-- 
cgit v1.2.3