diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-01-21 10:40:11 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-01-21 23:13:03 +1100 |
commit | aaca72d6f1279b842066e07bff797019efeb2c23 (patch) | |
tree | 1c052b62822f198ac6cfc33235345703f86e7925 /sshconnect2.c | |
parent | 70867e1ca2eb08bbd494fe9c568df4fd3b35b867 (diff) |
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
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index aa5160185..2aa7b9933 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.300 2019/01/21 10:29:56 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.301 2019/01/21 10:38:54 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * 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) | |||
201 | if ((r = kex_setup(ssh, myproposal)) != 0) | 201 | if ((r = kex_setup(ssh, myproposal)) != 0) |
202 | fatal("kex_setup: %s", ssh_err(r)); | 202 | fatal("kex_setup: %s", ssh_err(r)); |
203 | #ifdef WITH_OPENSSL | 203 | #ifdef WITH_OPENSSL |
204 | ssh->kex->kex[KEX_DH_GRP1_SHA1] = kex_kem_client; | 204 | ssh->kex->kex[KEX_DH_GRP1_SHA1] = kex_gen_client; |
205 | ssh->kex->kex[KEX_DH_GRP14_SHA1] = kex_kem_client; | 205 | ssh->kex->kex[KEX_DH_GRP14_SHA1] = kex_gen_client; |
206 | ssh->kex->kex[KEX_DH_GRP14_SHA256] = kex_kem_client; | 206 | ssh->kex->kex[KEX_DH_GRP14_SHA256] = kex_gen_client; |
207 | ssh->kex->kex[KEX_DH_GRP16_SHA512] = kex_kem_client; | 207 | ssh->kex->kex[KEX_DH_GRP16_SHA512] = kex_gen_client; |
208 | ssh->kex->kex[KEX_DH_GRP18_SHA512] = kex_kem_client; | 208 | ssh->kex->kex[KEX_DH_GRP18_SHA512] = kex_gen_client; |
209 | ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; | 209 | ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; |
210 | ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; | 210 | ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; |
211 | # ifdef OPENSSL_HAS_ECC | 211 | # ifdef OPENSSL_HAS_ECC |
212 | ssh->kex->kex[KEX_ECDH_SHA2] = kex_kem_client; | 212 | ssh->kex->kex[KEX_ECDH_SHA2] = kex_gen_client; |
213 | # endif | 213 | # endif |
214 | #endif | 214 | #endif |
215 | ssh->kex->kex[KEX_C25519_SHA256] = kex_kem_client; | 215 | ssh->kex->kex[KEX_C25519_SHA256] = kex_gen_client; |
216 | ssh->kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_kem_client; | 216 | ssh->kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_gen_client; |
217 | ssh->kex->verify_host_key=&verify_host_key_callback; | 217 | ssh->kex->verify_host_key=&verify_host_key_callback; |
218 | 218 | ||
219 | ssh_dispatch_run_fatal(ssh, DISPATCH_BLOCK, &ssh->kex->done); | 219 | ssh_dispatch_run_fatal(ssh, DISPATCH_BLOCK, &ssh->kex->done); |