upstream commit

add support for additional fixed DH groups from
 draft-ietf-curdle-ssh-kex-sha2-03

diffie-hellman-group14-sha256 (2K group)
diffie-hellman-group16-sha512 (4K group)
diffie-hellman-group18-sha512 (8K group)

based on patch from Mark D. Baushke and Darren Tucker
ok markus@

Upstream-ID: ac00406ada4f0dfec41585ca0839f039545bc46f

1 files changed, 11 insertions, 4 deletions

diff --git a/myproposal.h b/myproposal.h
index bdd05966f..597090164 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -67,13 +67,18 @@
 #endif
 
 #ifdef HAVE_EVP_SHA256
-# define KEX_SHA256_METHODS \
-        "diffie-hellman-group-exchange-sha256,"
+# define KEX_SHA2_METHODS \
+        "diffie-hellman-group-exchange-sha256," \
+        "diffie-hellman-group16-sha512," \
+        "diffie-hellman-group18-sha512,"
+# define KEX_SHA2_GROUP14 \
+        "diffie-hellman-group14-sha256,"
 #define SHA2_HMAC_MODES \
         "hmac-sha2-256," \
         "hmac-sha2-512,"
 #else
-# define KEX_SHA256_METHODS
+# define KEX_SHA2_METHODS
+# define KEX_SHA2_GROUP14
 # define SHA2_HMAC_MODES
 #endif
 
@@ -86,13 +91,15 @@
 #define KEX_COMMON_KEX \
         KEX_CURVE25519_METHODS \
         KEX_ECDH_METHODS \
-        KEX_SHA256_METHODS
+        KEX_SHA2_METHODS
 
 #define KEX_SERVER_KEX KEX_COMMON_KEX \
+        KEX_SHA2_GROUP14 \
         "diffie-hellman-group14-sha1" \
 
 #define KEX_CLIENT_KEX KEX_COMMON_KEX \
         "diffie-hellman-group-exchange-sha1," \
+        KEX_SHA2_GROUP14 \
         "diffie-hellman-group14-sha1"
 
 #define KEX_DEFAULT_PK_ALG      \