summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sshd.c b/sshd.c
index ddbedd6c6..058260d6f 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.531 2019/01/21 10:29:56 djm Exp $ */ 1/* $OpenBSD: sshd.c,v 1.532 2019/01/21 10:38:54 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
@@ -2207,19 +2207,19 @@ do_ssh2_kex(struct ssh *ssh)
2207 fatal("kex_setup: %s", ssh_err(r)); 2207 fatal("kex_setup: %s", ssh_err(r));
2208 kex = ssh->kex; 2208 kex = ssh->kex;
2209#ifdef WITH_OPENSSL 2209#ifdef WITH_OPENSSL
2210 kex->kex[KEX_DH_GRP1_SHA1] = kex_kem_server; 2210 kex->kex[KEX_DH_GRP1_SHA1] = kex_gen_server;
2211 kex->kex[KEX_DH_GRP14_SHA1] = kex_kem_server; 2211 kex->kex[KEX_DH_GRP14_SHA1] = kex_gen_server;
2212 kex->kex[KEX_DH_GRP14_SHA256] = kex_kem_server; 2212 kex->kex[KEX_DH_GRP14_SHA256] = kex_gen_server;
2213 kex->kex[KEX_DH_GRP16_SHA512] = kex_kem_server; 2213 kex->kex[KEX_DH_GRP16_SHA512] = kex_gen_server;
2214 kex->kex[KEX_DH_GRP18_SHA512] = kex_kem_server; 2214 kex->kex[KEX_DH_GRP18_SHA512] = kex_gen_server;
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] = kex_kem_server; 2218 kex->kex[KEX_ECDH_SHA2] = kex_gen_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_gen_server;
2222 kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_kem_server; 2222 kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_gen_server;
2223 kex->load_host_public_key=&get_hostkey_public_by_type; 2223 kex->load_host_public_key=&get_hostkey_public_by_type;
2224 kex->load_host_private_key=&get_hostkey_private_by_type; 2224 kex->load_host_private_key=&get_hostkey_private_by_type;
2225 kex->host_key_index=&get_hostkey_index; 2225 kex->host_key_index=&get_hostkey_index;