summaryrefslogtreecommitdiffstats
path: root/kex.h
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-12-07 04:39:40 +0100
committerDamien Miller <djm@mindrot.org>2018-12-27 04:30:17 +0100
commita6a0788cbbe8dfce2819ee43b09c80725742e21c (patch)
treec50cc8baa68f52a4539f90916a866fb70cb9a345 /kex.h
parentupstream: fix option letter pasto in previous (diff)
downloadopenssh-a6a0788cbbe8dfce2819ee43b09c80725742e21c.tar.xz
openssh-a6a0788cbbe8dfce2819ee43b09c80725742e21c.zip
upstream: only consider the ext-info-c extension during the initial
KEX. It shouldn't be sent in subsequent ones, but if it is present we should ignore it. This prevents sshd from sending a SSH_MSG_EXT_INFO for REKEX for buggy these clients. Reported by Jakub Jelen via bz2929; ok dtucker@ OpenBSD-Commit-ID: 91564118547f7807030ec537480303e2371902f9
Diffstat (limited to 'kex.h')
-rw-r--r--kex.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/kex.h b/kex.h
index 593de1208..0f67f58db 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.91 2018/07/11 18:53:29 markus Exp $ */
+/* $OpenBSD: kex.h,v 1.92 2018/12/07 03:39:40 djm Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -104,6 +104,7 @@ enum kex_exchange {
};
#define KEX_INIT_SENT 0x0001
+#define KEX_INITIAL 0x0002
struct sshenc {
char *name;