summaryrefslogtreecommitdiff
path: root/kex.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-07-17 17:22:45 +1000
committerDamien Miller <djm@mindrot.org>2005-07-17 17:22:45 +1000
commit0dc1bef12d30162ba09bfcc0b1cd6a5535ebdaab (patch)
treed891954deae6fe6f8574d2a7bbfe6b754a2e70dc /kex.c
parent2b9b045d930b8d724f768fafdd9a46fa453b9a3e (diff)
- djm@cvs.openbsd.org 2005/07/17 07:17:55
[auth-rh-rsa.c auth-rhosts.c auth2-chall.c auth2-gss.c channels.c] [cipher-ctr.c gss-genr.c gss-serv.c kex.c moduli.c readconf.c] [serverloop.c session.c sftp-client.c sftp.c ssh-add.c ssh-keygen.c] [sshconnect.c sshconnect2.c] knf says that a 2nd level indent is four (not three or five) spaces
Diffstat (limited to 'kex.c')
-rw-r--r--kex.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kex.c b/kex.c
index 32c6d03ea..06a3ad4cc 100644
--- a/kex.c
+++ b/kex.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: kex.c,v 1.62 2005/07/16 01:35:24 djm Exp $"); 26RCSID("$OpenBSD: kex.c,v 1.63 2005/07/17 07:17:55 djm Exp $");
27 27
28#include <openssl/crypto.h> 28#include <openssl/crypto.h>
29 29
@@ -392,7 +392,7 @@ kex_choose_conf(Kex *kex)
392 392
393 /* ignore the next message if the proposals do not match */ 393 /* ignore the next message if the proposals do not match */
394 if (first_kex_follows && !proposals_match(my, peer) && 394 if (first_kex_follows && !proposals_match(my, peer) &&
395 !(datafellows & SSH_BUG_FIRSTKEX)) { 395 !(datafellows & SSH_BUG_FIRSTKEX)) {
396 type = packet_read(); 396 type = packet_read();
397 debug2("skipping next packet (type %u)", type); 397 debug2("skipping next packet (type %u)", type);
398 } 398 }