diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-01-21 10:29:56 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-01-21 23:13:02 +1100 |
commit | 92dda34e373832f34a1944e5d9ebbebb184dedc1 (patch) | |
tree | 8aa632912cb292c095c6eaedc7056e8d5ecfa0ba /ssh_api.c | |
parent | b72357217cbe510a3ae155307a7be6b9181f1d1b (diff) |
upstream: use KEM API for vanilla ECDH
from markus@ ok djm@
OpenBSD-Commit-ID: 6fbff96339a929835536b5730585d1d6057a352c
Diffstat (limited to 'ssh_api.c')
-rw-r--r-- | ssh_api.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh_api.c,v 1.13 2019/01/21 10:28:02 djm Exp $ */ | 1 | /* $OpenBSD: ssh_api.c,v 1.14 2019/01/21 10:29:56 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2012 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2012 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -107,7 +107,7 @@ ssh_init(struct ssh **sshp, int is_server, struct kex_params *kex_params) | |||
107 | ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; | 107 | ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; |
108 | ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; | 108 | ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; |
109 | # ifdef OPENSSL_HAS_ECC | 109 | # ifdef OPENSSL_HAS_ECC |
110 | ssh->kex->kex[KEX_ECDH_SHA2] = kexecdh_server; | 110 | ssh->kex->kex[KEX_ECDH_SHA2] = kex_kem_server; |
111 | # endif | 111 | # endif |
112 | #endif /* WITH_OPENSSL */ | 112 | #endif /* WITH_OPENSSL */ |
113 | ssh->kex->kex[KEX_C25519_SHA256] = kex_kem_server; | 113 | ssh->kex->kex[KEX_C25519_SHA256] = kex_kem_server; |
@@ -125,7 +125,7 @@ ssh_init(struct ssh **sshp, int is_server, struct kex_params *kex_params) | |||
125 | ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; | 125 | ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; |
126 | ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; | 126 | ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; |
127 | # ifdef OPENSSL_HAS_ECC | 127 | # ifdef OPENSSL_HAS_ECC |
128 | ssh->kex->kex[KEX_ECDH_SHA2] = kexecdh_client; | 128 | ssh->kex->kex[KEX_ECDH_SHA2] = kex_kem_client; |
129 | # endif | 129 | # endif |
130 | #endif /* WITH_OPENSSL */ | 130 | #endif /* WITH_OPENSSL */ |
131 | ssh->kex->kex[KEX_C25519_SHA256] = kex_kem_client; | 131 | ssh->kex->kex[KEX_C25519_SHA256] = kex_kem_client; |