upstream: use KEM API for vanilla DH KEX

from markus@ ok djm@

OpenBSD-Commit-ID: af56466426b08a8be275412ae2743319e3d277c9

1 files changed, 6 insertions, 6 deletions

diff --git a/sshconnect2.c b/sshconnect2.c
index be19722bb..ebeff29bd 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.298 2019/01/21 10:24:09 djm Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.299 2019/01/21 10:28:02 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -201,11 +201,11 @@ ssh_kex2(struct ssh *ssh, char *host, struct sockaddr *hostaddr, u_short port)
         if ((r = kex_setup(ssh, myproposal)) != 0)
                 fatal("kex_setup: %s", ssh_err(r));
 #ifdef WITH_OPENSSL
-        ssh->kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client;
-        ssh->kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client;
-        ssh->kex->kex[KEX_DH_GRP14_SHA256] = kexdh_client;
-        ssh->kex->kex[KEX_DH_GRP16_SHA512] = kexdh_client;
-        ssh->kex->kex[KEX_DH_GRP18_SHA512] = kexdh_client;
+        ssh->kex->kex[KEX_DH_GRP1_SHA1] = kex_kem_client;
+        ssh->kex->kex[KEX_DH_GRP14_SHA1] = kex_kem_client;
+        ssh->kex->kex[KEX_DH_GRP14_SHA256] = kex_kem_client;
+        ssh->kex->kex[KEX_DH_GRP16_SHA512] = kex_kem_client;
+        ssh->kex->kex[KEX_DH_GRP18_SHA512] = kex_kem_client;
         ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_client;
         ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_client;
 # ifdef OPENSSL_HAS_ECC