diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2024-09-09 04:39:57 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2024-09-09 04:45:53 +0200 |
| commit | 62fb2b51bb7f6863c3ab697f397b2068da1c993f (patch) | |
| tree | 8af7d3d75c179aefc0760038d13d0dc8081a9b02 /monitor.c | |
| parent | upstream: make parsing user@host consistently look for the last '@' in (diff) | |
| download | openssh-62fb2b51bb7f6863c3ab697f397b2068da1c993f.tar.xz openssh-62fb2b51bb7f6863c3ab697f397b2068da1c993f.zip | |
upstream: pull post-quantum ML-KEM/x25519 key exchange out from
compile-time flag now than an IANA codepoint has been assigned for the
algorithm.
Add mlkem768x25519-sha256 in 2nd KexAlgorithms preference slot.
ok markus@
OpenBSD-Commit-ID: 9f50a0fae7d7ae8b27fcca11f8dc6f979207451a
Diffstat (limited to 'monitor.c')
| -rw-r--r-- | monitor.c | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.c,v 1.241 2024/09/02 12:13:56 djm Exp $ */ +/* $OpenBSD: monitor.c,v 1.242 2024/09/09 02:39:57 djm Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Markus Friedl <markus@openbsd.org> @@ -1763,9 +1763,7 @@ monitor_apply_keystate(struct ssh *ssh, struct monitor *pmonitor) #endif /* WITH_OPENSSL */ kex->kex[KEX_C25519_SHA256] = kex_gen_server; kex->kex[KEX_KEM_SNTRUP761X25519_SHA512] = kex_gen_server; -#ifdef WITH_MLKEM kex->kex[KEX_KEM_MLKEM768X25519_SHA256] = kex_gen_server; -#endif kex->load_host_public_key=&get_hostkey_public_by_type; kex->load_host_private_key=&get_hostkey_private_by_type; kex->host_key_index=&get_hostkey_index; |