diff options
| author | des <des@FreeBSD.org> | 2004-02-26 10:38:49 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-02-26 10:38:49 +0000 |
| commit | 7d1750f1d6c24163bf22790f8527f1783315c5e7 (patch) | |
| tree | 44704f8b727acba451fd902fe3c26053cb6ce73e /crypto/openssh/kex.c | |
| parent | 5c8d98dfbd6964b6be84da30b9d16df0cab3c42d (diff) | |
| download | FreeBSD-src-7d1750f1d6c24163bf22790f8527f1783315c5e7.zip FreeBSD-src-7d1750f1d6c24163bf22790f8527f1783315c5e7.tar.gz | |
Vendor import of OpenSSH 3.8p1.
Diffstat (limited to 'crypto/openssh/kex.c')
| -rw-r--r-- | crypto/openssh/kex.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssh/kex.c b/crypto/openssh/kex.c index b070ccf..5a952c9 100644 --- a/crypto/openssh/kex.c +++ b/crypto/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> @@ -310,7 +310,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[] = { @@ -392,7 +392,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); |
