upstream: add the sntrup761x25519-sha512@openssh.com hybrid

ECDH/x25519 + Streamlined NTRU Prime post-quantum KEX to the default
KEXAlgorithms list (after the ECDH methods but before the prime-group DH
ones).

ok markus@

OpenBSD-Commit-ID: 22b77e27a04e497a10e22f138107579652854210

diff --git a/myproposal.h b/myproposal.h
index 6d79937b6fa8b0478ac39e194d8968928dec8504..ee50d215be06717546d9889e5757978d35f650e9 100644 (file)
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.69 2021/08/29 23:53:10 djm Exp $ */
+/* $OpenBSD: myproposal.h,v 1.70 2021/11/10 06:29:25 djm Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -30,6 +30,7 @@
        "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/ssh_config.5 b/ssh_config.5
index 170125a0e4434e01ad9c6b6663d1c9eb3b59368f..dd223a844187de8a2fcd624b4011c094ac037244 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.366 2021/09/25 09:40:33 kn Exp $
-.Dd $Mdocdate: September 25 2021 $
+.\" $OpenBSD: ssh_config.5,v 1.367 2021/11/10 06:29:25 djm Exp $
+.Dd $Mdocdate: November 10 2021 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -1167,6 +1167,7 @@ The default is:
 .Bd -literal -offset indent
 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 2cea00f4c503a9fe9aabc220b745ff4743c8c352..74d7d4d6b81ed3652d53eb7c01cc6567b1952559 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.336 2021/10/09 10:52:42 dtucker Exp $
-.Dd $Mdocdate: October 9 2021 $
+.\" $OpenBSD: sshd_config.5,v 1.337 2021/11/10 06:29:25 djm Exp $
+.Dd $Mdocdate: November 10 2021 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -965,6 +965,7 @@ The default is:
 .Bd -literal -offset indent
 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