summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2017-07-25 09:22:25 +0000
committerDamien Miller <djm@mindrot.org>2017-07-28 13:08:37 +1000
commit2985d4062ebf4204bbd373456a810d558698f9f5 (patch)
tree6741edfc8914ae4ad50c0d3434c3a8cd61886798
parent9f0e44e1a0439ff4646495d5735baa61138930a9 (diff)
upstream commit
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@ Upstream-ID: 6fd7c32e99af3952db007aa180e73142ddbc741a
-rw-r--r--compat.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/compat.c b/compat.c
index 156a5ea8e..d82135e2b 100644
--- a/compat.c
+++ b/compat.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: compat.c,v 1.103 2017/04/30 23:13:25 djm Exp $ */ 1/* $OpenBSD: compat.c,v 1.104 2017/07/25 09:22:25 dtucker Exp $ */
2/* 2/*
3 * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. 3 * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
4 * 4 *
@@ -177,9 +177,12 @@ compat_datafellows(const char *version)
177 "TTSSH/2.72*", SSH_BUG_HOSTKEYS }, 177 "TTSSH/2.72*", SSH_BUG_HOSTKEYS },
178 { "WinSCP_release_4*," 178 { "WinSCP_release_4*,"
179 "WinSCP_release_5.0*," 179 "WinSCP_release_5.0*,"
180 "WinSCP_release_5.1*," 180 "WinSCP_release_5.1,"
181 "WinSCP_release_5.5*," 181 "WinSCP_release_5.1.*,"
182 "WinSCP_release_5.6*," 182 "WinSCP_release_5.5,"
183 "WinSCP_release_5.5.*,"
184 "WinSCP_release_5.6,"
185 "WinSCP_release_5.6.*,"
183 "WinSCP_release_5.7," 186 "WinSCP_release_5.7,"
184 "WinSCP_release_5.7.1," 187 "WinSCP_release_5.7.1,"
185 "WinSCP_release_5.7.2," 188 "WinSCP_release_5.7.2,"