Import openssh_7.0p1.orig.tar.gz

1 files changed, 5 insertions, 3 deletions

diff --git a/compat.c b/compat.c
index 0631024f0..eef5fbba5 100644
--- a/compat.c
+++ b/compat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: compat.c,v 1.94 2015/05/26 23:23:40 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*,"
@@ -166,7 +167,8 @@ compat_datafellows(const char *version)
                   "OSU_1.5alpha3*",     SSH_BUG_PASSWORDPAD },
                 { "*SSH_Version_Mapper*",
                                         SSH_BUG_SCANNER },
-                { "PuTTY-Release-0.5*," /* 0.50-0.57, DH-GEX in >=0.52 */
+                { "PuTTY_Local:*,"      /* dev versions < Sep 2014 */
+                  "PuTTY-Release-0.5*," /* 0.50-0.57, DH-GEX in >=0.52 */
                   "PuTTY_Release_0.5*," /* 0.58-0.59 */
                   "PuTTY_Release_0.60*,"
                   "PuTTY_Release_0.61*,"