diff options
| author |   djm <djm@openbsd.org> | 2019-01-21 10:24:09 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2019-01-21 10:24:09 +0000 |
| commit | f3ab853dfed023e3657f4173a1933238c7dd3c23 (patch) | |
| tree | 477846d01fc84b519ab64156ca3c4c9b0f3a06d5 /usr.bin/ssh/ssh_api.c | |
| parent | Add support for a PQC KEX/KEM: sntrup4591761x25519-sha512@tinyssh.org (diff) | |
| download | wireguard-openbsd-f3ab853dfed023e3657f4173a1933238c7dd3c23.tar.xz wireguard-openbsd-f3ab853dfed023e3657f4173a1933238c7dd3c23.zip | |
use KEM API for vanilla c25519 KEX
Diffstat (limited to 'usr.bin/ssh/ssh_api.c')
| -rw-r--r-- | usr.bin/ssh/ssh_api.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh_api.c b/usr.bin/ssh/ssh_api.c index 7fe799a62d5..26645eeaa84 100644 --- a/usr.bin/ssh/ssh_api.c +++ b/usr.bin/ssh/ssh_api.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh_api.c,v 1.11 2019/01/21 10:20:12 djm Exp $ */ +/* $OpenBSD: ssh_api.c,v 1.12 2019/01/21 10:24:09 djm Exp $ */ /* * Copyright (c) 2012 Markus Friedl. All rights reserved. * @@ -104,7 +104,7 @@ ssh_init(struct ssh **sshp, int is_server, struct kex_params *kex_params) ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; ssh->kex->kex[KEX_ECDH_SHA2] = kexecdh_server; #endif /* WITH_OPENSSL */ - ssh->kex->kex[KEX_C25519_SHA256] = kexc25519_server; + ssh->kex->kex[KEX_C25519_SHA256] = kex_kem_server; ssh->kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_kem_server; ssh->kex->load_host_public_key=&_ssh_host_public_key; ssh->kex->load_host_private_key=&_ssh_host_private_key; @@ -120,7 +120,7 @@ ssh_init(struct ssh **sshp, int is_server, struct kex_params *kex_params) ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; ssh->kex->kex[KEX_ECDH_SHA2] = kexecdh_client; #endif /* WITH_OPENSSL */ - ssh->kex->kex[KEX_C25519_SHA256] = kexc25519_client; + ssh->kex->kex[KEX_C25519_SHA256] = kex_kem_client; ssh->kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_kem_client; ssh->kex->verify_host_key =&_ssh_verify_host_key; } |