===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/myproposal.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- src/usr.bin/ssh/myproposal.h	2018/09/12 01:34:02	1.57
+++ src/usr.bin/ssh/myproposal.h	2019/02/23 08:20:43	1.58
@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.57 2018/09/12 01:34:02 djm Exp $ */
+/* $OpenBSD: myproposal.h,v 1.58 2019/02/23 08:20:43 djm Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -26,7 +26,7 @@
 
 #ifdef WITH_OPENSSL
 
-#define KEX_COMMON_KEX		\
+#define KEX_SERVER_KEX	\
 	"curve25519-sha256," \
 	"curve25519-sha256@libssh.org," \
 	"ecdh-sha2-nistp256," \
@@ -34,16 +34,11 @@
 	"ecdh-sha2-nistp521," \
 	"diffie-hellman-group-exchange-sha256," \
 	"diffie-hellman-group16-sha512," \
-	"diffie-hellman-group18-sha512" \
-
-#define KEX_SERVER_KEX KEX_COMMON_KEX "," \
+	"diffie-hellman-group18-sha512," \
 	"diffie-hellman-group14-sha256," \
 	"diffie-hellman-group14-sha1"
 
-#define KEX_CLIENT_KEX KEX_COMMON_KEX "," \
-	"diffie-hellman-group-exchange-sha1," \
-	"diffie-hellman-group14-sha256," \
-	"diffie-hellman-group14-sha1"
+#define KEX_CLIENT_KEX KEX_SERVER_KEX
 
 #define	KEX_DEFAULT_PK_ALG	\
 	"ecdsa-sha2-nistp256-cert-v01@openssh.com," \