diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-01-21 10:24:09 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-01-21 22:08:04 +1100 |
commit | 2f6a9ddbbf6ca8623c53c323ff17fb6d68d66970 (patch) | |
tree | 2fe3ee7094f85e9f834d69c5d609a1b9fe886930 /monitor.c | |
parent | dfd591618cdf2c96727ac0eb65f89cf54af0d97e (diff) |
upstream: use KEM API for vanilla c25519 KEX
OpenBSD-Commit-ID: 38d937b85ff770886379dd66a8f32ab0c1c35c1f
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor.c,v 1.193 2019/01/21 10:20:12 djm Exp $ */ | 1 | /* $OpenBSD: monitor.c,v 1.194 2019/01/21 10:24:09 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> | 4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> |
@@ -1688,7 +1688,7 @@ monitor_apply_keystate(struct ssh *ssh, struct monitor *pmonitor) | |||
1688 | kex->kex[KEX_ECDH_SHA2] = kexecdh_server; | 1688 | kex->kex[KEX_ECDH_SHA2] = kexecdh_server; |
1689 | # endif | 1689 | # endif |
1690 | #endif /* WITH_OPENSSL */ | 1690 | #endif /* WITH_OPENSSL */ |
1691 | kex->kex[KEX_C25519_SHA256] = kexc25519_server; | 1691 | kex->kex[KEX_C25519_SHA256] = kex_kem_server; |
1692 | kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_kem_server; | 1692 | kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_kem_server; |
1693 | kex->load_host_public_key=&get_hostkey_public_by_type; | 1693 | kex->load_host_public_key=&get_hostkey_public_by_type; |
1694 | kex->load_host_private_key=&get_hostkey_private_by_type; | 1694 | kex->load_host_private_key=&get_hostkey_private_by_type; |