summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2015-08-19 23:21:42 +0000
committerdjm <djm@openbsd.org>2015-08-19 23:21:42 +0000
commitcb2ca4e7ad6cf3ee756dc0bedc9395d9aaa44a10 (patch)
tree5977d5c1943784c86be1b9e0f664c91eb30f4eaf
parentfix double-free() in error path of DSA key generation reported by (diff)
downloadwireguard-openbsd-cb2ca4e7ad6cf3ee756dc0bedc9395d9aaa44a10.tar.xz
wireguard-openbsd-cb2ca4e7ad6cf3ee756dc0bedc9395d9aaa44a10.zip
Better compat matching for WinSCP, add compat matching for
FuTTY (fork of PuTTY); ok markus@ deraadt@
-rw-r--r--usr.bin/ssh/compat.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/usr.bin/ssh/compat.c b/usr.bin/ssh/compat.c
index 3e6a9435491..8f09b8b46b8 100644
--- a/usr.bin/ssh/compat.c
+++ b/usr.bin/ssh/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.
*
@@ -174,6 +174,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*,"
@@ -187,7 +188,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 }
};