diff options
Diffstat (limited to 'kex.c')
-rw-r--r-- | kex.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: kex.c,v 1.55 2003/04/01 10:31:26 markus Exp $"); | 26 | RCSID("$OpenBSD: kex.c,v 1.56 2003/11/21 11:57:03 djm Exp $"); |
27 | 27 | ||
28 | #include <openssl/crypto.h> | 28 | #include <openssl/crypto.h> |
29 | 29 | ||
@@ -310,7 +310,7 @@ choose_hostkeyalg(Kex *k, char *client, char *server) | |||
310 | xfree(hostkeyalg); | 310 | xfree(hostkeyalg); |
311 | } | 311 | } |
312 | 312 | ||
313 | static int | 313 | static int |
314 | proposals_match(char *my[PROPOSAL_MAX], char *peer[PROPOSAL_MAX]) | 314 | proposals_match(char *my[PROPOSAL_MAX], char *peer[PROPOSAL_MAX]) |
315 | { | 315 | { |
316 | static int check[] = { | 316 | static int check[] = { |
@@ -392,7 +392,7 @@ 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 | !(datafellows & SSH_BUG_FIRSTKEX)) { |
397 | type = packet_read(); | 397 | type = packet_read(); |
398 | debug2("skipping next packet (type %u)", type); | 398 | debug2("skipping next packet (type %u)", type); |