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

diff --git a/Makefile.in b/Makefile.in
index fd539184a65f61cac020296580d7451730e17cef..6f001bb360dfda385bd582445193f9ba36d58fd4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -99,7 +99,7 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
        sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o \
        kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \
        kexgexc.o kexgexs.o \
-       sntrup4591761.o kexsntrup4591761x25519.o kexkemc.o kexkems.o \
+       sntrup4591761.o kexsntrup4591761x25519.o kexgen.o \
        platform-pledge.o platform-tracing.o platform-misc.o
 
 

diff --git a/kex.c b/kex.c
index 4fb087863dda0fdfac2dd21f909f0732f1792ee8..cec9b29854b862b47234fef9c1d8f7b11fbeb6d6 100644 (file)
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.148 2019/01/21 10:33:49 djm Exp $ */
+/* $OpenBSD: kex.c,v 1.149 2019/01/21 10:40:11 djm Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
@@ -655,7 +655,7 @@ kex_free(struct kex *kex)
        sshbuf_free(kex->my);
        sshbuf_free(kex->client_version);
        sshbuf_free(kex->server_version);
-       sshbuf_free(kex->kem_client_pub);
+       sshbuf_free(kex->client_pub);
        free(kex->session_id);
        free(kex->failed_choice);
        free(kex->hostkey_alg);

diff --git a/kex.h b/kex.h
index 6798e33f9aa910f7fc963c466a29b47458abebd7..44e6d197210578a50074f683502cde45e76a4a58 100644 (file)
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.104 2019/01/21 10:35:09 djm Exp $ */
+/* $OpenBSD: kex.h,v 1.106 2019/01/21 10:40:11 djm Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -170,7 +170,7 @@ struct kex {
        u_char c25519_client_key[CURVE25519_SIZE]; /* 25519 + KEM */
        u_char c25519_client_pubkey[CURVE25519_SIZE]; /* 25519 */
        u_char sntrup4591761_client_key[crypto_kem_sntrup4591761_SECRETKEYBYTES]; /* KEM */
-       struct sshbuf *kem_client_pub;  /* KEM */
+       struct sshbuf *client_pub;
 };
 
 int     kex_names_valid(const char *);
@@ -199,16 +199,10 @@ int        kex_derive_keys(struct ssh *, u_char *, u_int, const struct sshbuf *);
 int     kex_send_newkeys(struct ssh *);
 int     kex_start_rekex(struct ssh *);
 
-int     kexdh_client(struct ssh *);
-int     kexdh_server(struct ssh *);
 int     kexgex_client(struct ssh *);
 int     kexgex_server(struct ssh *);
-int     kexecdh_client(struct ssh *);
-int     kexecdh_server(struct ssh *);
-int     kexc25519_client(struct ssh *);
-int     kexc25519_server(struct ssh *);
-int     kex_kem_client(struct ssh *);
-int     kex_kem_server(struct ssh *);
+int     kex_gen_client(struct ssh *);
+int     kex_gen_server(struct ssh *);
 
 int     kex_dh_keypair(struct kex *);
 int     kex_dh_enc(struct kex *, const struct sshbuf *, struct sshbuf **,
@@ -241,11 +235,6 @@ int         kexgex_hash(int, const struct sshbuf *, const struct sshbuf *,
     const BIGNUM *, const u_char *, size_t,
     u_char *, size_t *);
 
-int     kex_c25519_hash(int, const struct sshbuf *, const struct sshbuf *,
-    const u_char *, size_t, const u_char *, size_t,
-    const u_char *, size_t, const struct sshbuf *, const struct sshbuf *,
-    const struct sshbuf *, u_char *, size_t *);
-
 void   kexc25519_keygen(u_char key[CURVE25519_SIZE], u_char pub[CURVE25519_SIZE])
        __attribute__((__bounded__(__minbytes__, 1, CURVE25519_SIZE)))
        __attribute__((__bounded__(__minbytes__, 2, CURVE25519_SIZE)));

diff --git a/kexc25519.c b/kexc25519.c
index ec5bb574f8bd1cd161222ae89b7e9887059fdfee..f13d766d7247b28422ec378b314e386a4be4251e 100644 (file)
--- a/kexc25519.c
+++ b/kexc25519.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexc25519.c,v 1.15 2019/01/21 10:35:09 djm Exp $ */
+/* $OpenBSD: kexc25519.c,v 1.17 2019/01/21 10:40:11 djm Exp $ */
 /*
  * Copyright (c) 2019 Markus Friedl.  All rights reserved.
  * Copyright (c) 2010 Damien Miller.  All rights reserved.
@@ -88,57 +88,6 @@ kexc25519_shared_key(const u_char key[CURVE25519_SIZE],
        return kexc25519_shared_key_ext(key, pub, out, 0);
 }
 
-int
-kex_c25519_hash(
-    int hash_alg,
-    const struct sshbuf *client_version,
-    const struct sshbuf *server_version,
-    const u_char *ckexinit, size_t ckexinitlen,
-    const u_char *skexinit, size_t skexinitlen,
-    const u_char *serverhostkeyblob, size_t sbloblen,
-    const struct sshbuf *client_pub,
-    const struct sshbuf *server_pub,
-    const struct sshbuf *shared_secret,
-    u_char *hash, size_t *hashlen)
-{
-       struct sshbuf *b;
-       int r;
-
-       if (*hashlen < ssh_digest_bytes(hash_alg))
-               return SSH_ERR_INVALID_ARGUMENT;
-       if ((b = sshbuf_new()) == NULL)
-               return SSH_ERR_ALLOC_FAIL;
-       if ((r = sshbuf_put_stringb(b, client_version)) != 0 ||
-           (r = sshbuf_put_stringb(b, server_version)) != 0 ||
-           /* kexinit messages: fake header: len+SSH2_MSG_KEXINIT */
-           (r = sshbuf_put_u32(b, ckexinitlen+1)) != 0 ||
-           (r = sshbuf_put_u8(b, SSH2_MSG_KEXINIT)) != 0 ||
-           (r = sshbuf_put(b, ckexinit, ckexinitlen)) != 0 ||
-           (r = sshbuf_put_u32(b, skexinitlen+1)) != 0 ||
-           (r = sshbuf_put_u8(b, SSH2_MSG_KEXINIT)) != 0 ||
-           (r = sshbuf_put(b, skexinit, skexinitlen)) != 0 ||
-           (r = sshbuf_put_string(b, serverhostkeyblob, sbloblen)) != 0 ||
-           (r = sshbuf_put_stringb(b, client_pub)) != 0 ||
-           (r = sshbuf_put_stringb(b, server_pub)) != 0 ||
-           (r = sshbuf_putb(b, shared_secret)) != 0) {
-               sshbuf_free(b);
-               return r;
-       }
-#ifdef DEBUG_KEX
-       sshbuf_dump(b, stderr);
-#endif
-       if (ssh_digest_buffer(hash_alg, b, hash, *hashlen) != 0) {
-               sshbuf_free(b);
-               return SSH_ERR_LIBCRYPTO_ERROR;
-       }
-       sshbuf_free(b);
-       *hashlen = ssh_digest_bytes(hash_alg);
-#ifdef DEBUG_KEX
-       dump_digest("hash", hash, *hashlen);
-#endif
-       return 0;
-}
-
 int
 kex_c25519_keypair(struct kex *kex)
 {
@@ -154,7 +103,7 @@ kex_c25519_keypair(struct kex *kex)
 #ifdef DEBUG_KEXECDH
        dump_digest("client public key c25519:", cp, CURVE25519_SIZE);
 #endif
-       kex->kem_client_pub = buf;
+       kex->client_pub = buf;
        buf = NULL;
  out:
        sshbuf_free(buf);

diff --git a/kexdh.c b/kexdh.c
index 943774624805647bef1fdfc69439beb4431d97ba..6812add20c4e57f0034f8ed5daa39dbe1d1b7c94 100644 (file)
--- a/kexdh.c
+++ b/kexdh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexdh.c,v 1.31 2019/01/21 10:35:09 djm Exp $ */
+/* $OpenBSD: kexdh.c,v 1.32 2019/01/21 10:40:11 djm Exp $ */
 /*
  * Copyright (c) 2019 Markus Friedl.  All rights reserved.
  *
@@ -128,7 +128,7 @@ kex_dh_keypair(struct kex *kex)
        BN_print_fp(stderr, pub_key);
        fprintf(stderr, "\n");
 #endif
-       kex->kem_client_pub = buf;
+       kex->client_pub = buf;
        buf = NULL;
  out:
        sshbuf_free(buf);

diff --git a/kexecdh.c b/kexecdh.c
index ae9018773b6eafb160884acbba6361f6ce292730..0aeab2e9b13be514f49d17c4dfdfd25d8a419e8c 100644 (file)
--- a/kexecdh.c
+++ b/kexecdh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexecdh.c,v 1.9 2019/01/21 10:35:09 djm Exp $ */
+/* $OpenBSD: kexecdh.c,v 1.10 2019/01/21 10:40:11 djm Exp $ */
 /*
  * Copyright (c) 2010 Damien Miller.  All rights reserved.
  * Copyright (c) 2019 Markus Friedl.  All rights reserved.
@@ -80,7 +80,7 @@ kex_ecdh_keypair(struct kex *kex)
        kex->ec_client_key = client_key;
        kex->ec_group = group;
        client_key = NULL;      /* owned by the kex */
-       kex->kem_client_pub = buf;
+       kex->client_pub = buf;
        buf = NULL;
  out:
        EC_KEY_free(client_key);

diff --git a/kexsntrup4591761x25519.c b/kexsntrup4591761x25519.c
index d845f3d445dbff86281c2c8e6fe6c29af3aaf797..b0605b96a5c91c411c76ee3ae0a3f2e2384c1f59 100644 (file)
--- a/kexsntrup4591761x25519.c
+++ b/kexsntrup4591761x25519.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexsntrup4591761x25519.c,v 1.2 2019/01/21 10:35:09 djm Exp $ */
+/* $OpenBSD: kexsntrup4591761x25519.c,v 1.3 2019/01/21 10:40:11 djm Exp $ */
 /*
  * Copyright (c) 2019 Markus Friedl.  All rights reserved.
  *
@@ -58,7 +58,7 @@ kex_kem_sntrup4591761x25519_keypair(struct kex *kex)
 #ifdef DEBUG_KEXECDH
        dump_digest("client public key c25519:", cp, CURVE25519_SIZE);
 #endif
-       kex->kem_client_pub = buf;
+       kex->client_pub = buf;
        buf = NULL;
  out:
        sshbuf_free(buf);

diff --git a/monitor.c b/monitor.c
index d3357b73c90c49677457af6d046fef40b73c50a3..60e52944447864452bd543fc0285adfdbee9889e 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.196 2019/01/21 10:29:56 djm Exp $ */
+/* $OpenBSD: monitor.c,v 1.197 2019/01/21 10:38:54 djm Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -1677,19 +1677,19 @@ monitor_apply_keystate(struct ssh *ssh, struct monitor *pmonitor)
        if ((kex = ssh->kex) != NULL) {
                /* XXX set callbacks */
 #ifdef WITH_OPENSSL
-               kex->kex[KEX_DH_GRP1_SHA1] = kex_kem_server;
-               kex->kex[KEX_DH_GRP14_SHA1] = kex_kem_server;
-               kex->kex[KEX_DH_GRP14_SHA256] = kex_kem_server;
-               kex->kex[KEX_DH_GRP16_SHA512] = kex_kem_server;
-               kex->kex[KEX_DH_GRP18_SHA512] = kex_kem_server;
+               kex->kex[KEX_DH_GRP1_SHA1] = kex_gen_server;
+               kex->kex[KEX_DH_GRP14_SHA1] = kex_gen_server;
+               kex->kex[KEX_DH_GRP14_SHA256] = kex_gen_server;
+               kex->kex[KEX_DH_GRP16_SHA512] = kex_gen_server;
+               kex->kex[KEX_DH_GRP18_SHA512] = kex_gen_server;
                kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
                kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
 # ifdef OPENSSL_HAS_ECC
-               kex->kex[KEX_ECDH_SHA2] = kex_kem_server;
+               kex->kex[KEX_ECDH_SHA2] = kex_gen_server;
 # endif
 #endif /* WITH_OPENSSL */
-               kex->kex[KEX_C25519_SHA256] = kex_kem_server;
-               kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_kem_server;
+               kex->kex[KEX_C25519_SHA256] = kex_gen_server;
+               kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_gen_server;
                kex->load_host_public_key=&get_hostkey_public_by_type;
                kex->load_host_private_key=&get_hostkey_private_by_type;
                kex->host_key_index=&get_hostkey_index;

diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 9541ecf4ac61c720eb3f64e3b7a13107b9d4a66b..144daa6df6305cc70f63f609d3079e16f69fd96b 100644 (file)
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keyscan.c,v 1.124 2019/01/21 10:29:56 djm Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.125 2019/01/21 10:38:54 djm Exp $ */
 /*
  * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
  *
@@ -260,19 +260,19 @@ keygrab_ssh2(con *c)
                exit(1);
        }
 #ifdef WITH_OPENSSL
-       c->c_ssh->kex->kex[KEX_DH_GRP1_SHA1] = kex_kem_client;
-       c->c_ssh->kex->kex[KEX_DH_GRP14_SHA1] = kex_kem_client;
-       c->c_ssh->kex->kex[KEX_DH_GRP14_SHA256] = kex_kem_client;
-       c->c_ssh->kex->kex[KEX_DH_GRP16_SHA512] = kex_kem_client;
-       c->c_ssh->kex->kex[KEX_DH_GRP18_SHA512] = kex_kem_client;
+       c->c_ssh->kex->kex[KEX_DH_GRP1_SHA1] = kex_gen_client;
+       c->c_ssh->kex->kex[KEX_DH_GRP14_SHA1] = kex_gen_client;
+       c->c_ssh->kex->kex[KEX_DH_GRP14_SHA256] = kex_gen_client;
+       c->c_ssh->kex->kex[KEX_DH_GRP16_SHA512] = kex_gen_client;
+       c->c_ssh->kex->kex[KEX_DH_GRP18_SHA512] = kex_gen_client;
        c->c_ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_client;
        c->c_ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_client;
 # ifdef OPENSSL_HAS_ECC
-       c->c_ssh->kex->kex[KEX_ECDH_SHA2] = kex_kem_client;
+       c->c_ssh->kex->kex[KEX_ECDH_SHA2] = kex_gen_client;
 # endif
 #endif
-       c->c_ssh->kex->kex[KEX_C25519_SHA256] = kex_kem_client;
-       c->c_ssh->kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_kem_client;
+       c->c_ssh->kex->kex[KEX_C25519_SHA256] = kex_gen_client;
+       c->c_ssh->kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_gen_client;
        ssh_set_verify_host_key_callback(c->c_ssh, key_print_wrapper);
        /*
         * do the key-exchange until an error occurs or until

diff --git a/ssh_api.c b/ssh_api.c
index b21769d2309dc242548c26998b016c3b9ba56190..57509973b5103f634ea1a8bb92b14e44d4ed3a1c 100644 (file)
--- 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;

diff --git a/sshconnect2.c b/sshconnect2.c
index aa516018599e4644dd35878164e09f728fb6a4f2..2aa7b99333288c3be350d6498052cad4e1eb0930 100644 (file)
--- 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);

diff --git a/sshd.c b/sshd.c
index ddbedd6c67fd3ecdf26e634192a37ab86e1b344d..058260d6f98ff61cbd4a05e7d5e1a1444ed50dbf 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.531 2019/01/21 10:29:56 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.532 2019/01/21 10:38:54 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2207,19 +2207,19 @@ do_ssh2_kex(struct ssh *ssh)
                fatal("kex_setup: %s", ssh_err(r));
        kex = ssh->kex;
 #ifdef WITH_OPENSSL
-       kex->kex[KEX_DH_GRP1_SHA1] = kex_kem_server;
-       kex->kex[KEX_DH_GRP14_SHA1] = kex_kem_server;
-       kex->kex[KEX_DH_GRP14_SHA256] = kex_kem_server;
-       kex->kex[KEX_DH_GRP16_SHA512] = kex_kem_server;
-       kex->kex[KEX_DH_GRP18_SHA512] = kex_kem_server;
+       kex->kex[KEX_DH_GRP1_SHA1] = kex_gen_server;
+       kex->kex[KEX_DH_GRP14_SHA1] = kex_gen_server;
+       kex->kex[KEX_DH_GRP14_SHA256] = kex_gen_server;
+       kex->kex[KEX_DH_GRP16_SHA512] = kex_gen_server;
+       kex->kex[KEX_DH_GRP18_SHA512] = kex_gen_server;
        kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
        kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
 # ifdef OPENSSL_HAS_ECC
-       kex->kex[KEX_ECDH_SHA2] = kex_kem_server;
+       kex->kex[KEX_ECDH_SHA2] = kex_gen_server;
 # endif
 #endif
-       kex->kex[KEX_C25519_SHA256] = kex_kem_server;
-       kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_kem_server;
+       kex->kex[KEX_C25519_SHA256] = kex_gen_server;
+       kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_gen_server;
        kex->load_host_public_key=&get_hostkey_public_by_type;
        kex->load_host_private_key=&get_hostkey_private_by_type;
        kex->host_key_index=&get_hostkey_index;