summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordtucker <dtucker@openbsd.org>2017-07-25 09:22:25 +0000
committerdtucker <dtucker@openbsd.org>2017-07-25 09:22:25 +0000
commitd407c638bf8c2fc3db643f18aa0acd95581ef8e1 (patch)
tree3bbd91bdcd26cb28544776516e58a297ac7cf665
parentPrint CPU type as we do on arm64. This is how ARM prints revisions in its (diff)
downloadwireguard-openbsd-d407c638bf8c2fc3db643f18aa0acd95581ef8e1.tar.xz
wireguard-openbsd-d407c638bf8c2fc3db643f18aa0acd95581ef8e1.zip
Make WinSCP patterns for SSH_OLD_DHGEX more specific to exclude WinSCP
5.10.x and up. bz#2748, from martin at winscp.net, ok djm@
-rw-r--r--usr.bin/ssh/compat.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/usr.bin/ssh/compat.c b/usr.bin/ssh/compat.c
index 3fe96e8280c..73952db1d2f 100644
--- a/usr.bin/ssh/compat.c
+++ b/usr.bin/ssh/compat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: compat.c,v 1.103 2017/04/30 23:13:25 djm Exp $ */
+/* $OpenBSD: compat.c,v 1.104 2017/07/25 09:22:25 dtucker Exp $ */
/*
* Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
*
@@ -175,9 +175,12 @@ compat_datafellows(const char *version)
"TTSSH/2.72*", SSH_BUG_HOSTKEYS },
{ "WinSCP_release_4*,"
"WinSCP_release_5.0*,"
- "WinSCP_release_5.1*,"
- "WinSCP_release_5.5*,"
- "WinSCP_release_5.6*,"
+ "WinSCP_release_5.1,"
+ "WinSCP_release_5.1.*,"
+ "WinSCP_release_5.5,"
+ "WinSCP_release_5.5.*,"
+ "WinSCP_release_5.6,"
+ "WinSCP_release_5.6.*,"
"WinSCP_release_5.7,"
"WinSCP_release_5.7.1,"
"WinSCP_release_5.7.2,"