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, 17 insertions, 17 deletions

diff --git a/ssh_api.c b/ssh_api.c
index b21769d23..57509973b 100644
--- a/ssh_api.c
+++ b/ssh_api.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh_api.c,v 1.14 2019/01/21 10:29:56 djm Exp $ */
+/* $OpenBSD: ssh_api.c,v 1.15 2019/01/21 10:38:54 djm Exp $ */
 /*
  * Copyright (c) 2012 Markus Friedl.  All rights reserved.
  *
@@ -99,37 +99,37 @@ ssh_init(struct ssh **sshp, int is_server, struct kex_params *kex_params)
         ssh->kex->server = is_server;
         if (is_server) {
 #ifdef WITH_OPENSSL
-                ssh->kex->kex[KEX_DH_GRP1_SHA1] = kex_kem_server;
-                ssh->kex->kex[KEX_DH_GRP14_SHA1] = kex_kem_server;
-                ssh->kex->kex[KEX_DH_GRP14_SHA256] = kex_kem_server;
-                ssh->kex->kex[KEX_DH_GRP16_SHA512] = kex_kem_server;
-                ssh->kex->kex[KEX_DH_GRP18_SHA512] = kex_kem_server;
+                ssh->kex->kex[KEX_DH_GRP1_SHA1] = kex_gen_server;
+                ssh->kex->kex[KEX_DH_GRP14_SHA1] = kex_gen_server;
+                ssh->kex->kex[KEX_DH_GRP14_SHA256] = kex_gen_server;
+                ssh->kex->kex[KEX_DH_GRP16_SHA512] = kex_gen_server;
+                ssh->kex->kex[KEX_DH_GRP18_SHA512] = kex_gen_server;
                 ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
                 ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
 # ifdef OPENSSL_HAS_ECC
-                ssh->kex->kex[KEX_ECDH_SHA2] = kex_kem_server;
+                ssh->kex->kex[KEX_ECDH_SHA2] = kex_gen_server;
 # endif
 #endif /* WITH_OPENSSL */
-                ssh->kex->kex[KEX_C25519_SHA256] = kex_kem_server;
-                ssh->kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_kem_server;
+                ssh->kex->kex[KEX_C25519_SHA256] = kex_gen_server;
+                ssh->kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_gen_server;
                 ssh->kex->load_host_public_key=&_ssh_host_public_key;
                 ssh->kex->load_host_private_key=&_ssh_host_private_key;
                 ssh->kex->sign=&_ssh_host_key_sign;
         } else {
 #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 /* WITH_OPENSSL */
-                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 =&_ssh_verify_host_key;
         }
         *sshp = ssh;