diff options
| author | naddy@openbsd.org <naddy@openbsd.org> | 2024-09-09 16:41:21 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2024-09-11 01:38:22 +0200 |
| commit | 1bc426f51b0a5cfdcfbd205218f0b6839ffe91e9 (patch) | |
| tree | c0962c61706f2a1bff9aa4e8f2eb932d57611342 | |
| parent | Spell omnios test host correctly. (diff) | |
| download | openssh-1bc426f51b0a5cfdcfbd205218f0b6839ffe91e9.tar.xz openssh-1bc426f51b0a5cfdcfbd205218f0b6839ffe91e9.zip | |
upstream: document the mlkem768x25519-sha256 key exchange algorithm
OpenBSD-Commit-ID: fa18dccdd9753dd287e62ecab189b3de45672521
| -rw-r--r-- | ssh_config.5 | 5 | ||||
| -rw-r--r-- | sshd_config.5 | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 46b0554be..7c7c5c50d 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.401 2024/09/03 06:17:48 jmc Exp $ -.Dd $Mdocdate: September 3 2024 $ +.\" $OpenBSD: ssh_config.5,v 1.402 2024/09/09 14:41:21 naddy Exp $ +.Dd $Mdocdate: September 9 2024 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -1287,6 +1287,7 @@ default set. The default is: .Bd -literal -offset indent sntrup761x25519-sha512,sntrup761x25519-sha512@openssh.com, +mlkem768x25519-sha256, curve25519-sha256,curve25519-sha256@libssh.org, ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521, diffie-hellman-group-exchange-sha256, diff --git a/sshd_config.5 b/sshd_config.5 index 587a90334..87f0945c2 100644 --- a/sshd_config.5 +++ b/sshd_config.5 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: sshd_config.5,v 1.369 2024/08/22 23:11:30 djm Exp $ -.Dd $Mdocdate: August 22 2024 $ +.\" $OpenBSD: sshd_config.5,v 1.370 2024/09/09 14:41:21 naddy Exp $ +.Dd $Mdocdate: September 9 2024 $ .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -1050,6 +1050,8 @@ ecdh-sha2-nistp384 .It ecdh-sha2-nistp521 .It +mlkem768x25519-sha256 +.It sntrup761x25519-sha512 .It sntrup761x25519-sha512@openssh.com @@ -1058,6 +1060,7 @@ sntrup761x25519-sha512@openssh.com The default is: .Bd -literal -offset indent sntrup761x25519-sha512,sntrup761x25519-sha512@openssh.com, +mlkem768x25519-sha256, curve25519-sha256,curve25519-sha256@libssh.org, ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521, diffie-hellman-group-exchange-sha256, |