upstream commit

add Cisco to the list of clients that choke on the
 hostkeys update extension. Pointed out by Howard Kash

Upstream-ID: c9eadde28ecec056c73d09ee10ba4570dfba7e84

diff --git a/compat.c b/compat.c
index 5ea57ed499be089cc45f81fad5f772abb11a3df8..eef5fbba5b64d57398853d7f2016a59aea6edf02 100644 (file)
--- 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*,"