diff options
| author | naddy@openbsd.org <naddy@openbsd.org> | 2024-10-25 23:53:24 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2024-10-27 03:09:32 +0100 |
| commit | ae566d51b64fa3dce7063e7745b9b35f8f47abde (patch) | |
| tree | 78e455b1c26b25e7173bccc8c67c8319cfffcbc2 | |
| parent | Retire the minix3 test config. (diff) | |
| download | openssh-ae566d51b64fa3dce7063e7745b9b35f8f47abde.tar.xz openssh-ae566d51b64fa3dce7063e7745b9b35f8f47abde.zip | |
upstream: mlkem768x25519-sha256 has been promoted to default key
exchange
OpenBSD-Commit-ID: 5a3259a193fd42108a869ebf650b95b5f2d08dcf
| -rw-r--r-- | ssh_config.5 | 6 | ||||
| -rw-r--r-- | sshd_config.5 | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 08c823ab3..2793a955a 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.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 29d690a2f..baca8f25c 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.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 |