upstream: ssh: document sntrup761x25519-sha512@openssh.com as

default KEX

OpenBSD-Commit-ID: 12545bfa10bcbf552d04d9d9520d0f4e98b0e171

diff --git a/ssh_config.5 b/ssh_config.5
index 333dfc6b39f381b66a6d42019200ab37b0656193..59ff96465e1ce1fee39e9bb3cd4e491791b9df1a 100644 (file)
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,7 +33,7 @@
 .\" (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.370 2022/03/31 17:27:27 naddy Exp $
+.\" $OpenBSD: ssh_config.5,v 1.371 2022/03/31 17:58:44 naddy Exp $
 .Dd $Mdocdate: March 31 2022 $
 .Dt SSH_CONFIG 5
 .Os
@@ -1165,9 +1165,9 @@ character, then the specified algorithms will be placed at the head of the
 default set.
 The default is:
 .Bd -literal -offset indent
+sntrup761x25519-sha512@openssh.com,
 curve25519-sha256,curve25519-sha256@libssh.org,
 ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
-sntrup761x25519-sha512@openssh.com,
 diffie-hellman-group-exchange-sha256,
 diffie-hellman-group16-sha512,
 diffie-hellman-group18-sha512,

diff --git a/sshd_config.5 b/sshd_config.5
index 985f1ba5cbd9316612f8a16c950b8955797c3ab7..3a4ffab7c5023a5e284c12a99ebf172af0c00868 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.339 2021/12/04 00:05:39 naddy Exp $
-.Dd $Mdocdate: December 4 2021 $
+.\" $OpenBSD: sshd_config.5,v 1.340 2022/03/31 17:58:44 naddy Exp $
+.Dd $Mdocdate: March 31 2022 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -961,9 +961,9 @@ sntrup761x25519-sha512@openssh.com
 .Pp
 The default is:
 .Bd -literal -offset indent
+sntrup761x25519-sha512@openssh.com,
 curve25519-sha256,curve25519-sha256@libssh.org,
 ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
-sntrup761x25519-sha512@openssh.com,
 diffie-hellman-group-exchange-sha256,
 diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,
 diffie-hellman-group14-sha256