summaryrefslogtreecommitdiff
path: root/sshd.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 /sshd.c
parentb72357217cbe510a3ae155307a7be6b9181f1d1b (diff)
upstream: use KEM API for vanilla ECDH
from markus@ ok djm@ OpenBSD-Commit-ID: 6fbff96339a929835536b5730585d1d6057a352c
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sshd.c b/sshd.c
index eb92785bf..ddbedd6c6 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.530 2019/01/21 10:28:02 djm Exp $ */ 1/* $OpenBSD: sshd.c,v 1.531 2019/01/21 10:29:56 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2215,7 +2215,7 @@ do_ssh2_kex(struct ssh *ssh)
2215 kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; 2215 kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
2216 kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; 2216 kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
2217# ifdef OPENSSL_HAS_ECC 2217# ifdef OPENSSL_HAS_ECC
2218 kex->kex[KEX_ECDH_SHA2] = kexecdh_server; 2218 kex->kex[KEX_ECDH_SHA2] = kex_kem_server;
2219# endif 2219# endif
2220#endif 2220#endif
2221 kex->kex[KEX_C25519_SHA256] = kex_kem_server; 2221 kex->kex[KEX_C25519_SHA256] = kex_kem_server;