upstream: mlkem768x25519-sha256 has been promoted to default key

exchange

OpenBSD-Commit-ID: 5a3259a193fd42108a869ebf650b95b5f2d08dcf

diff --git a/ssh_config.5 b/ssh_config.5
index 08c823ab3ad878c678b629471ecf649b3c39e2e2..2793a955a3481b19e6fe73d78328302ea0cdbbb9 100644 (file)
--- 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.404 2024/10/18 05:53:26 djm Exp $
-.Dd $Mdocdate: October 18 2024 $
+.\" $OpenBSD: ssh_config.5,v 1.405 2024/10/25 21:53:24 naddy Exp $
+.Dd $Mdocdate: October 25 2024 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -1286,8 +1286,8 @@ default set.
 .Pp
 The default is:
 .Bd -literal -offset indent
-sntrup761x25519-sha512,sntrup761x25519-sha512@openssh.com,
 mlkem768x25519-sha256,
+sntrup761x25519-sha512,sntrup761x25519-sha512@openssh.com,
 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 29d690a2fa6fac38bb721fe1a96496dfd5e78d15..baca8f25c78c010635741c297e4b062d9d0aca69 100644 (file)
--- 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.377 2024/10/18 04:11:54 djm Exp $
-.Dd $Mdocdate: October 18 2024 $
+.\" $OpenBSD: sshd_config.5,v 1.378 2024/10/25 21:53:24 naddy Exp $
+.Dd $Mdocdate: October 25 2024 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -1059,8 +1059,8 @@ sntrup761x25519-sha512@openssh.com
 .Pp
 The default is:
 .Bd -literal -offset indent
-sntrup761x25519-sha512,sntrup761x25519-sha512@openssh.com,
 mlkem768x25519-sha256,
+sntrup761x25519-sha512,sntrup761x25519-sha512@openssh.com,
 curve25519-sha256,curve25519-sha256@libssh.org,
 ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521
 .Ed