summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorChristian Weisgerber <naddy@cvs.openbsd.org>2024-10-25 21:53:25 +0000
committerChristian Weisgerber <naddy@cvs.openbsd.org>2024-10-25 21:53:25 +0000
commit9e22f81f2a8617536a8acc6f8ba329221dfc86fe (patch)
tree80a72b0be3d089666b900f7e91ae87a8769d10ef /usr.bin
parent1339662bec1965d8ce400b06ff7ad5c8a62d03ad (diff)
mlkem768x25519-sha256 has been promoted to default key exchange
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/ssh_config.56
-rw-r--r--usr.bin/ssh/sshd_config.56
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
index 04b49917898..2179e941e30 100644
--- a/usr.bin/ssh/ssh_config.5
+++ b/usr.bin/ssh/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
@@ -1287,8 +1287,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/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5
index e246f2fc1a8..a825f182601 100644
--- a/usr.bin/ssh/sshd_config.5
+++ b/usr.bin/ssh/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
@@ -1060,8 +1060,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