From: Damien Miller <djm@mindrot.org>
Date: Fri, 29 May 2015 08:03:15 +0000 (+1000)
Subject: fix merge botch that left ",," in KEX algs
X-Git-Tag: V_6_9_P1~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=599f01142a376645b15cbc9349d7e8975e1cf245;p=thirdparty%2Fopenssh-portable.git

fix merge botch that left ",," in KEX algs
---

diff --git a/myproposal.h b/myproposal.h
index a3e444b28..84b63bcd5 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -88,10 +88,10 @@
 	KEX_ECDH_METHODS \
 	KEX_SHA256_METHODS
 
-#define KEX_SERVER_KEX KEX_COMMON_KEX "," \
+#define KEX_SERVER_KEX KEX_COMMON_KEX \
 	"diffie-hellman-group14-sha1" \
 
-#define KEX_CLIENT_KEX KEX_COMMON_KEX "," \
+#define KEX_CLIENT_KEX KEX_COMMON_KEX \
 	"diffie-hellman-group-exchange-sha1," \
 	"diffie-hellman-group14-sha1," \
 	"diffie-hellman-group1-sha1"