summaryrefslogtreecommitdiff
path: root/myproposal.h
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2015-05-27 23:51:10 +0000
committerDamien Miller <djm@mindrot.org>2015-05-28 13:53:14 +1000
commit3ecde664c9fc5fb3667aedf9e6671462600f6496 (patch)
treeda5d5c774bd23ab5d5e5984644487773e8e76170 /myproposal.h
parent40f64292b907afd0a674fdbf3e4c2356d17a7d68 (diff)
upstream commit
Reorder client proposal to prefer diffie-hellman-group-exchange-sha1 over diffie-hellman-group14-sha1. ok djm@ Upstream-ID: 552c08d47347c3ee1a9a57d88441ab50abe17058
Diffstat (limited to 'myproposal.h')
-rw-r--r--myproposal.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/myproposal.h b/myproposal.h
index c397553a..a3e444b2 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.43 2015/04/21 07:01:00 jsg Exp $ */
+/* $OpenBSD: myproposal.h,v 1.44 2015/05/27 23:51:10 dtucker Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -83,14 +83,17 @@
# else
# define KEX_CURVE25519_METHODS ""
# endif
-#define KEX_SERVER_KEX \
+#define KEX_COMMON_KEX \
KEX_CURVE25519_METHODS \
KEX_ECDH_METHODS \
- KEX_SHA256_METHODS \
- "diffie-hellman-group14-sha1"
+ KEX_SHA256_METHODS
-#define KEX_CLIENT_KEX KEX_SERVER_KEX "," \
+#define KEX_SERVER_KEX KEX_COMMON_KEX "," \
+ "diffie-hellman-group14-sha1" \
+
+#define KEX_CLIENT_KEX KEX_COMMON_KEX "," \
"diffie-hellman-group-exchange-sha1," \
+ "diffie-hellman-group14-sha1," \
"diffie-hellman-group1-sha1"
#define KEX_DEFAULT_PK_ALG \