summaryrefslogtreecommitdiff
path: root/ssh-keyscan.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-01-21 10:29:56 +0000
committerDamien Miller <djm@mindrot.org>2019-01-21 23:13:02 +1100
commit92dda34e373832f34a1944e5d9ebbebb184dedc1 (patch)
tree8aa632912cb292c095c6eaedc7056e8d5ecfa0ba /ssh-keyscan.c
parentb72357217cbe510a3ae155307a7be6b9181f1d1b (diff)
upstream: use KEM API for vanilla ECDH
from markus@ ok djm@ OpenBSD-Commit-ID: 6fbff96339a929835536b5730585d1d6057a352c
Diffstat (limited to 'ssh-keyscan.c')
-rw-r--r--ssh-keyscan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 3d2760056..9541ecf4a 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keyscan.c,v 1.123 2019/01/21 10:28:02 djm Exp $ */ 1/* $OpenBSD: ssh-keyscan.c,v 1.124 2019/01/21 10:29:56 djm Exp $ */
2/* 2/*
3 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. 3 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
4 * 4 *
@@ -268,7 +268,7 @@ keygrab_ssh2(con *c)
268 c->c_ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; 268 c->c_ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_client;
269 c->c_ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; 269 c->c_ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_client;
270# ifdef OPENSSL_HAS_ECC 270# ifdef OPENSSL_HAS_ECC
271 c->c_ssh->kex->kex[KEX_ECDH_SHA2] = kexecdh_client; 271 c->c_ssh->kex->kex[KEX_ECDH_SHA2] = kex_kem_client;
272# endif 272# endif
273#endif 273#endif
274 c->c_ssh->kex->kex[KEX_C25519_SHA256] = kex_kem_client; 274 c->c_ssh->kex->kex[KEX_C25519_SHA256] = kex_kem_client;