* Update to current GSSAPI patch from

  http://www.sxw.org.uk/computing/patches/openssh-4.3p2-gsskex-20060223.patch
  (closes: #352042).

1 files changed, 6 insertions, 2 deletions

diff --git a/kex.c b/kex.c
index e0b9d5872..47983f8d9 100644
--- a/kex.c
+++ b/kex.c
@@ -306,8 +306,12 @@ choose_kex(Kex *k, char *client, char *server)
                 k->kex_type = KEX_DH_GEX_SHA1;
                 k->evp_md = EVP_sha1();
 #ifdef GSSAPI
-        } else if (strncmp(k->name, KEX_GSS_SHA1, 
-            sizeof(KEX_GSS_SHA1)-1) == 0) {
+        } else if (strncmp(k->name, KEX_GSS_GEX_SHA1_ID,
+            sizeof(KEX_GSS_GEX_SHA1_ID)-1) == 0) {
+                k->kex_type = KEX_GSS_GEX_SHA1;
+                k->evp_md = EVP_sha1();
+        } else if (strncmp(k->name, KEX_GSS_GRP1_SHA1_ID,
+            sizeof(KEX_GSS_GRP1_SHA1_ID)-1) == 0) {
                 k->kex_type = KEX_GSS_GRP1_SHA1;
                 k->evp_md = EVP_sha1();
 #endif