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, 9 insertions, 1 deletions

diff --git a/kexdhs.c b/kexdhs.c
index bf933e4c9..108f66427 100644
--- a/kexdhs.c
+++ b/kexdhs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexdhs.c,v 1.23 2015/12/04 16:41:28 markus Exp $ */
+/* $OpenBSD: kexdhs.c,v 1.24 2016/05/02 10:26:04 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -63,8 +63,15 @@ kexdh_server(struct ssh *ssh)
                 kex->dh = dh_new_group1();
                 break;
         case KEX_DH_GRP14_SHA1:
+        case KEX_DH_GRP14_SHA256:
                 kex->dh = dh_new_group14();
                 break;
+        case KEX_DH_GRP16_SHA512:
+                kex->dh = dh_new_group16();
+                break;
+        case KEX_DH_GRP18_SHA512:
+                kex->dh = dh_new_group18();
+                break;
         default:
                 r = SSH_ERR_INVALID_ARGUMENT;
                 goto out;
@@ -158,6 +165,7 @@ input_kex_dh_init(int type, u_int32_t seq, void *ctxt)
         /* calc H */
         hashlen = sizeof(hash);
         if ((r = kex_dh_hash(
+            kex->hash_alg,
             kex->client_version_string,
             kex->server_version_string,
             sshbuf_ptr(kex->peer), sshbuf_len(kex->peer),