upstream: rename kex->kem_client_pub -> kex->client_pub now that

KEM has been renamed to kexgen

from markus@ ok djm@

OpenBSD-Commit-ID: fac6da5dc63530ad0da537db022a9a4cfbe8bed8

1 files changed, 9 insertions, 9 deletions

diff --git a/sshconnect2.c b/sshconnect2.c
index aa5160185..2aa7b9933 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.300 2019/01/21 10:29:56 djm Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.301 2019/01/21 10:38:54 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -201,19 +201,19 @@ 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] = 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_GRP1_SHA1] = kex_gen_client;
+        ssh->kex->kex[KEX_DH_GRP14_SHA1] = kex_gen_client;
+        ssh->kex->kex[KEX_DH_GRP14_SHA256] = kex_gen_client;
+        ssh->kex->kex[KEX_DH_GRP16_SHA512] = kex_gen_client;
+        ssh->kex->kex[KEX_DH_GRP18_SHA512] = kex_gen_client;
         ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_client;
         ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_client;
 # ifdef OPENSSL_HAS_ECC
-        ssh->kex->kex[KEX_ECDH_SHA2] = kex_kem_client;
+        ssh->kex->kex[KEX_ECDH_SHA2] = kex_gen_client;
 # endif
 #endif
-        ssh->kex->kex[KEX_C25519_SHA256] = kex_kem_client;
-        ssh->kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_kem_client;
+        ssh->kex->kex[KEX_C25519_SHA256] = kex_gen_client;
+        ssh->kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_gen_client;
         ssh->kex->verify_host_key=&verify_host_key_callback;
 
         ssh_dispatch_run_fatal(ssh, DISPATCH_BLOCK, &ssh->kex->done);