summaryrefslogtreecommitdiff
path: root/compat.c
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2015-05-06 04:07:18 +0000
committerDamien Miller <djm@mindrot.org>2015-05-08 13:32:57 +1000
commitea139507bef8bad26e86ed99a42c7233ad115c38 (patch)
tree284258ef4c5c7557d2c1b2f1b8593b489e55548d /compat.c
parentb58234f00ee3872eb84f6e9e572a9a34e902e36e (diff)
upstream commit
Blacklist DH-GEX for specific PuTTY versions known to send non-RFC4419 DH-GEX messages rather than all versions of PuTTY. According to Simon Tatham, 0.65 and newer versions will send RFC4419 DH-GEX messages. ok djm@
Diffstat (limited to 'compat.c')
-rw-r--r--compat.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/compat.c b/compat.c
index aded29a0..7836a86b 100644
--- a/compat.c
+++ b/compat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: compat.c,v 1.92 2015/05/05 10:17:49 dtucker Exp $ */
+/* $OpenBSD: compat.c,v 1.93 2015/05/06 04:07:18 dtucker Exp $ */
/*
* Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
*
@@ -165,7 +165,14 @@ compat_datafellows(const char *version)
"OSU_1.5alpha3*", SSH_BUG_PASSWORDPAD },
{ "*SSH_Version_Mapper*",
SSH_BUG_SCANNER },
- { "PuTTY*", SSH_OLD_DHGEX },
+ { "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*,"
+ "PuTTY_Release_0.62*,"
+ "PuTTY_Release_0.63*,"
+ "PuTTY_Release_0.64*",
+ SSH_OLD_DHGEX },
{ "Probe-*",
SSH_BUG_PROBE },
{ "TeraTerm SSH*,"