commit 9768ca48f57aaf035f508a473421d210b5145e99
author Greg Hartman <ghartman@google.com> Thu Jun 22 20:49:52 2017 -0700
committer Greg Hartman <ghartman@google.com> Fri Jun 23 15:44:15 2017 -0700
tree c2ba282fc91c65b4abbf688efbd6f09f467601da
parent 7b5a7c1b3bb341c2ce7fa7d6386d4204680a92e4

Merge openssh 7.5p1

BUG: 35443510
Change-Id: I2558fb80234e145c13ccb7a51859f2a5fd2e0324

kexdhs.c

diff --git a/kexdhs.c b/kexdhs.c
index de7c05b..108f664 100644
--- a/kexdhs.c
+++ b/kexdhs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexdhs.c,v 1.22 2015/01/26 06:10:03 djm 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 @@
 		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 @@
 	/* 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),
@@ -181,8 +189,8 @@
 	}
 
 	/* sign H */
-	if ((r = kex->sign(server_host_private, server_host_public,
-	    &signature, &slen, hash, hashlen, ssh->compat)) < 0)
+	if ((r = kex->sign(server_host_private, server_host_public, &signature,
+	     &slen, hash, hashlen, kex->hostkey_alg, ssh->compat)) < 0)
 		goto out;
 
 	/* destroy_sensitive_data(); */