summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/monitor.c b/monitor.c
index d3357b73c..60e529444 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor.c,v 1.196 2019/01/21 10:29:56 djm Exp $ */ 1/* $OpenBSD: monitor.c,v 1.197 2019/01/21 10:38:54 djm Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * Copyright 2002 Markus Friedl <markus@openbsd.org> 4 * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -1677,19 +1677,19 @@ monitor_apply_keystate(struct ssh *ssh, struct monitor *pmonitor)
1677 if ((kex = ssh->kex) != NULL) { 1677 if ((kex = ssh->kex) != NULL) {
1678 /* XXX set callbacks */ 1678 /* XXX set callbacks */
1679#ifdef WITH_OPENSSL 1679#ifdef WITH_OPENSSL
1680 kex->kex[KEX_DH_GRP1_SHA1] = kex_kem_server; 1680 kex->kex[KEX_DH_GRP1_SHA1] = kex_gen_server;
1681 kex->kex[KEX_DH_GRP14_SHA1] = kex_kem_server; 1681 kex->kex[KEX_DH_GRP14_SHA1] = kex_gen_server;
1682 kex->kex[KEX_DH_GRP14_SHA256] = kex_kem_server; 1682 kex->kex[KEX_DH_GRP14_SHA256] = kex_gen_server;
1683 kex->kex[KEX_DH_GRP16_SHA512] = kex_kem_server; 1683 kex->kex[KEX_DH_GRP16_SHA512] = kex_gen_server;
1684 kex->kex[KEX_DH_GRP18_SHA512] = kex_kem_server; 1684 kex->kex[KEX_DH_GRP18_SHA512] = kex_gen_server;
1685 kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; 1685 kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
1686 kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; 1686 kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
1687# ifdef OPENSSL_HAS_ECC 1687# ifdef OPENSSL_HAS_ECC
1688 kex->kex[KEX_ECDH_SHA2] = kex_kem_server; 1688 kex->kex[KEX_ECDH_SHA2] = kex_gen_server;
1689# endif 1689# endif
1690#endif /* WITH_OPENSSL */ 1690#endif /* WITH_OPENSSL */
1691 kex->kex[KEX_C25519_SHA256] = kex_kem_server; 1691 kex->kex[KEX_C25519_SHA256] = kex_gen_server;
1692 kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_kem_server; 1692 kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_gen_server;
1693 kex->load_host_public_key=&get_hostkey_public_by_type; 1693 kex->load_host_public_key=&get_hostkey_public_by_type;
1694 kex->load_host_private_key=&get_hostkey_private_by_type; 1694 kex->load_host_private_key=&get_hostkey_private_by_type;
1695 kex->host_key_index=&get_hostkey_index; 1695 kex->host_key_index=&get_hostkey_index;