diff options
author | Damien Miller <djm@mindrot.org> | 2003-04-01 21:44:37 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-04-01 21:44:37 +1000 |
commit | d32090426bc9ebf6ec982acad029b75a48033175 (patch) | |
tree | e64fcbeee977affbc87d61daf881cacd6e19613c /kex.c | |
parent | 2dc074ef4bd925a7c95b9741ab20ab07c79dc2ff (diff) |
- markus@cvs.openbsd.org 2003/04/01 10:31:26
[compat.c compat.h kex.c]
bugfix causes stalled connections for ssh.com < 3.0; noticed by ho@;
tested by ho@ and myself
Diffstat (limited to 'kex.c')
-rw-r--r-- | kex.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: kex.c,v 1.54 2003/02/16 17:09:57 markus Exp $"); | 26 | RCSID("$OpenBSD: kex.c,v 1.55 2003/04/01 10:31:26 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/crypto.h> | 28 | #include <openssl/crypto.h> |
29 | 29 | ||
@@ -392,7 +392,8 @@ kex_choose_conf(Kex *kex) | |||
392 | kex->we_need = need; | 392 | kex->we_need = need; |
393 | 393 | ||
394 | /* ignore the next message if the proposals do not match */ | 394 | /* ignore the next message if the proposals do not match */ |
395 | if (first_kex_follows && !proposals_match(my, peer)) { | 395 | if (first_kex_follows && !proposals_match(my, peer) && |
396 | !(datafellows & SSH_BUG_FIRSTKEX)) { | ||
396 | type = packet_read(); | 397 | type = packet_read(); |
397 | debug2("skipping next packet (type %u)", type); | 398 | debug2("skipping next packet (type %u)", type); |
398 | } | 399 | } |