upstream commit

Better compat matching for WinSCP, add compat matching
 for FuTTY (fork of PuTTY); ok markus@ deraadt@

Upstream-ID: 24001d1ac115fa3260fbdc329a4b9aeb283c5389

diff --git a/compat.c b/compat.c
index eef5fbba5b64d57398853d7f2016a59aea6edf02..55838044c49f11d5906d6dcac2b82add27d46fd4 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: compat.c,v 1.96 2015/07/28 23:20:42 djm Exp $ */
+/* $OpenBSD: compat.c,v 1.97 2015/08/19 23:21:42 djm Exp $ */
 /*
  * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  *
@@ -176,6 +176,7 @@ compat_datafellows(const char *version)
                  "PuTTY_Release_0.63*,"
                  "PuTTY_Release_0.64*",
                                        SSH_OLD_DHGEX },
+               { "FuTTY*",             SSH_OLD_DHGEX }, /* Putty Fork */
                { "Probe-*",
                                        SSH_BUG_PROBE },
                { "TeraTerm SSH*,"
@@ -189,7 +190,17 @@ compat_datafellows(const char *version)
                  "TTSSH/2.70*,"
                  "TTSSH/2.71*,"
                  "TTSSH/2.72*",        SSH_BUG_HOSTKEYS },
-               { "WinSCP*",            SSH_OLD_DHGEX },
+               { "WinSCP_release_4*,"
+                 "WinSCP_release_5.0*,"
+                 "WinSCP_release_5.1*,"
+                 "WinSCP_release_5.5*,"
+                 "WinSCP_release_5.6*,"
+                 "WinSCP_release_5.7,"
+                 "WinSCP_release_5.7.1,"
+                 "WinSCP_release_5.7.2,"
+                 "WinSCP_release_5.7.3,"
+                 "WinSCP_release_5.7.4",
+                                       SSH_OLD_DHGEX },
                { NULL,                 0 }
        };