From: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Tue, 5 May 2015 10:17:49 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_6_9_P1~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b58234f00ee3872eb84f6e9e572a9a34e902e36e;p=thirdparty%2Fopenssh-portable.git

upstream commit

WinSCP doesn't implement RFC4419 DH-GEX so flag it so we
 don't offer that KEX method.  ok markus@
---

diff --git a/compat.c b/compat.c
index cea63d268..aded29a0a 100644
--- a/compat.c
+++ b/compat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: compat.c,v 1.90 2015/04/13 02:04:08 djm Exp $ */
+/* $OpenBSD: compat.c,v 1.92 2015/05/05 10:17:49 dtucker Exp $ */
 /*
  * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  *
@@ -179,6 +179,7 @@ compat_datafellows(const char *version)
 		  "TTSSH/2.70*,"
 		  "TTSSH/2.71*,"
 		  "TTSSH/2.72*",	SSH_BUG_HOSTKEYS },
+		{ "WinSCP*",		SSH_OLD_DHGEX },
 		{ NULL,			0 }
 	};