summaryrefslogtreecommitdiffstats
path: root/compat.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-07-29 01:20:42 +0200
committerDamien Miller <djm@mindrot.org>2015-07-29 11:35:41 +0200
commitb6ea0e573042eb85d84defb19227c89eb74cf05a (patch)
tree6025db2187a0b8f3a358ee6cfdfe3149b9e174b9 /compat.c
parentupstream commit (diff)
downloadopenssh-b6ea0e573042eb85d84defb19227c89eb74cf05a.tar.xz
openssh-b6ea0e573042eb85d84defb19227c89eb74cf05a.zip
upstream commit
add Cisco to the list of clients that choke on the hostkeys update extension. Pointed out by Howard Kash Upstream-ID: c9eadde28ecec056c73d09ee10ba4570dfba7e84
Diffstat (limited to 'compat.c')
-rw-r--r--compat.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/compat.c b/compat.c
index 5ea57ed49..eef5fbba5 100644
--- a/compat.c
+++ b/compat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: compat.c,v 1.95 2015/07/13 04:57:14 dtucker Exp $ */
+/* $OpenBSD: compat.c,v 1.96 2015/07/28 23:20:42 djm Exp $ */
/*
* Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
*
@@ -152,7 +152,8 @@ compat_datafellows(const char *version)
"1.2.22*", SSH_BUG_IGNOREMSG },
{ "1.3.2*", /* F-Secure */
SSH_BUG_IGNOREMSG },
- { "Cisco-1.*", SSH_BUG_DHGEX_LARGE },
+ { "Cisco-1.*", SSH_BUG_DHGEX_LARGE|
+ SSH_BUG_HOSTKEYS },
{ "*SSH Compatible Server*", /* Netscreen */
SSH_BUG_PASSWORDPAD },
{ "*OSU_0*,"