[openssh-commits] [openssh] 01/01: fix merge botch that left ", , " in KEX algs

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 599f01142a376645b15cbc9349d7e8975e1cf245
Author: Damien Miller <djm at mindrot.org>
Date:   Fri May 29 18:03:15 2015 +1000

    fix merge botch that left ",," in KEX algs
---
 myproposal.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/myproposal.h b/myproposal.h
index a3e444b..84b63bc 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"

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.