added note that we added GT 3.2b compatibility in this release

[gssapi-openssh.git] / openssh / kex.c

diff --git a/openssh/kex.c b/openssh/kex.c
index 3269d264ce0e54a0d3a500ebd92dcd9b81d6a187..183044cf6419dc4a851fc4cb7467c20685f79c20 100644 (file)
--- a/openssh/kex.c
+++ b/openssh/kex.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: kex.c,v 1.55 2003/04/01 10:31:26 markus Exp $");
+RCSID("$OpenBSD: kex.c,v 1.56 2003/11/21 11:57:03 djm Exp $");
 
 #include <openssl/crypto.h>
 
@@ -294,14 +294,13 @@ choose_kex(Kex *k, char *client, char *server)
 {
        k->name = match_list(client, server, NULL);
        if (k->name == NULL)
-               fatal("No key exchange algorithm");
+               fatal("no kex alg");
        if (strcmp(k->name, KEX_DH1) == 0) {
                k->kex_type = KEX_DH_GRP1_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) {
+       } else if (strncmp(k->name, KEX_GSS_SHA1, sizeof(KEX_GSS_SHA1)-1) == 0) {
                k->kex_type = KEX_GSS_GRP1_SHA1;
 #endif
        } else
@@ -319,7 +318,7 @@ choose_hostkeyalg(Kex *k, char *client, char *server)
        xfree(hostkeyalg);
 }
 
-static int 
+static int
 proposals_match(char *my[PROPOSAL_MAX], char *peer[PROPOSAL_MAX])
 {
        static int check[] = {
@@ -401,7 +400,7 @@ kex_choose_conf(Kex *kex)
        kex->we_need = need;
 
        /* ignore the next message if the proposals do not match */
-       if (first_kex_follows && !proposals_match(my, peer) && 
+       if (first_kex_follows && !proposals_match(my, peer) &&
           !(datafellows & SSH_BUG_FIRSTKEX)) {
                type = packet_read();
                debug2("skipping next packet (type %u)", type);