summaryrefslogtreecommitdiffstats
path: root/myproposal.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2015-05-29 10:03:15 +0200
committerDamien Miller <djm@mindrot.org>2015-05-29 10:03:15 +0200
commit599f01142a376645b15cbc9349d7e8975e1cf245 (patch)
tree838a51c795554c4510a4a9dc000c5a0bc00e9764 /myproposal.h
parentre-enable SSH protocol 1 at compile time (diff)
downloadopenssh-599f01142a376645b15cbc9349d7e8975e1cf245.tar.xz
openssh-599f01142a376645b15cbc9349d7e8975e1cf245.zip
fix merge botch that left ",," in KEX algs
Diffstat (limited to 'myproposal.h')
-rw-r--r--myproposal.h4
1 files changed, 2 insertions, 2 deletions
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"