diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 20:42:47 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 20:42:47 +0000 |
commit | 9ad7b718d42e43f3a285fcbc8f91193931fce324 (patch) | |
tree | 95afe9b315fb73da54752d5bb71c682485b2d370 /kex.c | |
parent | 5d05471f6657646d1d6500c7c43134462c407ee6 (diff) |
import openssh-4.0p1-gssapikex.patch
Diffstat (limited to 'kex.c')
-rw-r--r-- | kex.c | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -42,6 +42,10 @@ RCSID("$OpenBSD: kex.c,v 1.60 2004/06/21 17:36:31 avsm Exp $"); | |||
42 | #include "dispatch.h" | 42 | #include "dispatch.h" |
43 | #include "monitor.h" | 43 | #include "monitor.h" |
44 | 44 | ||
45 | #ifdef GSSAPI | ||
46 | #include "ssh-gss.h" | ||
47 | #endif | ||
48 | |||
45 | #define KEX_COOKIE_LEN 16 | 49 | #define KEX_COOKIE_LEN 16 |
46 | 50 | ||
47 | /* prototype */ | 51 | /* prototype */ |
@@ -297,6 +301,11 @@ choose_kex(Kex *k, char *client, char *server) | |||
297 | k->kex_type = KEX_DH_GRP14_SHA1; | 301 | k->kex_type = KEX_DH_GRP14_SHA1; |
298 | } else if (strcmp(k->name, KEX_DHGEX) == 0) { | 302 | } else if (strcmp(k->name, KEX_DHGEX) == 0) { |
299 | k->kex_type = KEX_DH_GEX_SHA1; | 303 | k->kex_type = KEX_DH_GEX_SHA1; |
304 | #ifdef GSSAPI | ||
305 | } else if (strncmp(k->name, KEX_GSS_SHA1, | ||
306 | sizeof(KEX_GSS_SHA1)-1) == 0) { | ||
307 | k->kex_type = KEX_GSS_GRP1_SHA1; | ||
308 | #endif | ||
300 | } else | 309 | } else |
301 | fatal("bad kex alg %s", k->name); | 310 | fatal("bad kex alg %s", k->name); |
302 | } | 311 | } |