support sntrup761x25519-sha512 alias

OpenSSH 9.8 supports the sntrup761x25519-sha512@openssh.com
key agreement algorithm. As part of standardisation, this algorithm
has been assigned the name sntrup761x25519-sha512.

This commit enables the existing algorithm under this new name.

diff --git a/configure b/configure
index 07d19fd30cb0c6114c4dc867142129947108da26..32e38c4cbace0fbd6a4cc92c0f26d89b2cfb2bcd 100755 (executable)
--- a/configure
+++ b/configure
@@ -13317,6 +13317,9 @@ EOD
 printf "%s\n" "#define BROKEN_SETVBUF 1" >>confdefs.h
 
        ;;
+*-*-gnu*)
+                                       CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_GNU_SOURCE"
+       ;;
 esac
 
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking compiler and flags for sanity" >&5

diff --git a/kex-names.c b/kex-names.c
index 339eb1c23cc4105c9f13ac84241038bb84d3d628..1869b8ee1e2420288c9c99372a6d7a75190e79e5 100644 (file)
--- a/kex-names.c
+++ b/kex-names.c
@@ -77,6 +77,8 @@ static const struct kexalg kexalgs[] = {
        { KEX_CURVE25519_SHA256, KEX_C25519_SHA256, 0, SSH_DIGEST_SHA256 },
        { KEX_CURVE25519_SHA256_OLD, KEX_C25519_SHA256, 0, SSH_DIGEST_SHA256 },
 #ifdef USE_SNTRUP761X25519
+       { KEX_SNTRUP761X25519_SHA512_IANA, KEX_KEM_SNTRUP761X25519_SHA512, 0,
+           SSH_DIGEST_SHA512 },
        { KEX_SNTRUP761X25519_SHA512, KEX_KEM_SNTRUP761X25519_SHA512, 0,
            SSH_DIGEST_SHA512 },
 #endif

diff --git a/kex.h b/kex.h
index 34665eb20ce2e82ffa2a02a793241315111e8cc9..ed22b929fdc9d31f8008c487f0f6402f2cce3f37 100644 (file)
--- a/kex.h
+++ b/kex.h
@@ -63,6 +63,7 @@
 #define        KEX_CURVE25519_SHA256           "curve25519-sha256"
 #define        KEX_CURVE25519_SHA256_OLD       "curve25519-sha256@libssh.org"
 #define        KEX_SNTRUP761X25519_SHA512      "sntrup761x25519-sha512@openssh.com"
+#define        KEX_SNTRUP761X25519_SHA512_IANA "sntrup761x25519-sha512"
 
 #define COMP_NONE      0
 /* pre-auth compression (COMP_ZLIB) is only supported in the client */

diff --git a/moduli.0 b/moduli.0
index 057a018efe339967f04f30ae192cf66057bc1712..90700a16fde479d0bf8878595db32e210f80aeb1 100644 (file)
--- a/moduli.0
+++ b/moduli.0
@@ -71,4 +71,4 @@ STANDARDS
      M. Friedl, N. Provos, and W. Simpson, Diffie-Hellman Group Exchange for
      the Secure Shell (SSH) Transport Layer Protocol, RFC 4419, March 2006.
 
-OpenBSD 7.5                     April 16, 2022                     OpenBSD 7.5
+OpenBSD 7.7                     April 16, 2022                     OpenBSD 7.7

diff --git a/myproposal.h b/myproposal.h
index ee6e9f7415261c9e7a9d6ad64a2eccf26ec1d45a..0528cd783fa2cda9a076a55f948c2ddb637f4587 100644 (file)
--- a/myproposal.h
+++ b/myproposal.h
@@ -25,6 +25,7 @@
  */
 
 #define KEX_SERVER_KEX \
+       "sntrup761x25519-sha512," \
        "sntrup761x25519-sha512@openssh.com," \
        "curve25519-sha256," \
        "curve25519-sha256@libssh.org," \

diff --git a/scp.0 b/scp.0
index e098ddf55fcec34ac3955e85b12e24ae381178fd..85d5f83d5372eb129a8c61caf6f21ddca53b88f3 100644 (file)
--- a/scp.0
+++ b/scp.0
@@ -229,4 +229,4 @@ CAVEATS
      requires careful quoting of any characters that have special meaning to
      the remote shell, such as quote characters.
 
-OpenBSD 7.5                    December 16, 2022                   OpenBSD 7.5
+OpenBSD 7.7                    December 16, 2022                   OpenBSD 7.7

diff --git a/sftp-server.0 b/sftp-server.0
index 23fdda399806070312491b1a04482e0a02ed8673..273b69908c669c2e287098a8832b0255f0ec87d2 100644 (file)
--- a/sftp-server.0
+++ b/sftp-server.0
@@ -95,4 +95,4 @@ HISTORY
 AUTHORS
      Markus Friedl <markus@openbsd.org>
 
-OpenBSD 7.5                      July 27, 2021                     OpenBSD 7.5
+OpenBSD 7.7                      July 27, 2021                     OpenBSD 7.7

diff --git a/sftp.0 b/sftp.0
index c6a9e60c40e7a1cc7072c4f44dcfe041d7da8cfc..0476733c19d9a827e40719434254781b2dc8478b 100644 (file)
--- a/sftp.0
+++ b/sftp.0
@@ -435,4 +435,4 @@ SEE ALSO
      T. Ylonen and S. Lehtinen, SSH File Transfer Protocol, draft-ietf-secsh-
      filexfer-00.txt, January 2001, work in progress material.
 
-OpenBSD 7.5                    December 16, 2022                   OpenBSD 7.5
+OpenBSD 7.7                    December 16, 2022                   OpenBSD 7.7

diff --git a/ssh-add.0 b/ssh-add.0
index 30eed6672d644261edf6b5a08c6306c42613eac7..20f1a88e21ca5196c5fd9506bca47bd4c1804951 100644 (file)
--- a/ssh-add.0
+++ b/ssh-add.0
@@ -206,4 +206,4 @@ AUTHORS
      created OpenSSH.  Markus Friedl contributed the support for SSH protocol
      versions 1.5 and 2.0.
 
-OpenBSD 7.5                      June 17, 2024                     OpenBSD 7.5
+OpenBSD 7.7                      June 17, 2024                     OpenBSD 7.7

diff --git a/ssh-agent.0 b/ssh-agent.0
index 2e4ef7b6e38289a1130ba6941880743e789d5aff..238fa54e267adab1ed66dbe18180ecba652fb4c7 100644 (file)
--- a/ssh-agent.0
+++ b/ssh-agent.0
@@ -137,4 +137,4 @@ AUTHORS
      created OpenSSH.  Markus Friedl contributed the support for SSH protocol
      versions 1.5 and 2.0.
 
-OpenBSD 7.5                     August 10, 2023                    OpenBSD 7.5
+OpenBSD 7.7                     August 10, 2023                    OpenBSD 7.7

diff --git a/ssh-keygen.0 b/ssh-keygen.0
index a731a7fa856efb3cfa7d9d874a663ddc4f339789..13b032f46a8737cd41ba0a075fcc5e0075a063c8 100644 (file)
--- a/ssh-keygen.0
+++ b/ssh-keygen.0
@@ -904,4 +904,4 @@ AUTHORS
      created OpenSSH.  Markus Friedl contributed the support for SSH protocol
      versions 1.5 and 2.0.
 
-OpenBSD 7.5                      June 17, 2024                     OpenBSD 7.5
+OpenBSD 7.7                      June 17, 2024                     OpenBSD 7.7

diff --git a/ssh-keyscan.0 b/ssh-keyscan.0
index 110399094460b34f64379cdcac29c2f2ee4cd240..cf0962c82de800ac05f9bb68a89867b689a6190a 100644 (file)
--- a/ssh-keyscan.0
+++ b/ssh-keyscan.0
@@ -120,4 +120,4 @@ AUTHORS
      Davison <wayned@users.sourceforge.net> added support for protocol version
      2.
 
-OpenBSD 7.5                      June 17, 2024                     OpenBSD 7.5
+OpenBSD 7.7                      June 17, 2024                     OpenBSD 7.7

diff --git a/ssh-keysign.0 b/ssh-keysign.0
index 577955d1b545d187a4edc32bc5ca21069c3fd9a3..ff330580986f6e4e205aea57211a4d047c9cf5d6 100644 (file)
--- a/ssh-keysign.0
+++ b/ssh-keysign.0
@@ -47,4 +47,4 @@ HISTORY
 AUTHORS
      Markus Friedl <markus@openbsd.org>
 
-OpenBSD 7.5                      June 17, 2024                     OpenBSD 7.5
+OpenBSD 7.7                      June 17, 2024                     OpenBSD 7.7

diff --git a/ssh-pkcs11-helper.0 b/ssh-pkcs11-helper.0
index 5645872592b865639e1081b8519bf2e7e2783055..4b1cb8d7dd12ac961017dae328d494f8bd107144 100644 (file)
--- a/ssh-pkcs11-helper.0
+++ b/ssh-pkcs11-helper.0
@@ -32,4 +32,4 @@ HISTORY
 AUTHORS
      Markus Friedl <markus@openbsd.org>
 
-OpenBSD 7.5                     April 29, 2022                     OpenBSD 7.5
+OpenBSD 7.7                     April 29, 2022                     OpenBSD 7.7

diff --git a/ssh-sk-helper.0 b/ssh-sk-helper.0
index ea2117abd13ab37a2a0535c6708b19fcf0e7b6fc..4abc5e8a03c9b49a2c3c41422b1c877aeb5c9b7c 100644 (file)
--- a/ssh-sk-helper.0
+++ b/ssh-sk-helper.0
@@ -31,4 +31,4 @@ HISTORY
 AUTHORS
      Damien Miller <djm@openbsd.org>
 
-OpenBSD 7.5                     April 29, 2022                     OpenBSD 7.5
+OpenBSD 7.7                     April 29, 2022                     OpenBSD 7.7

diff --git a/ssh.0 b/ssh.0
index 78863b1b0b24159466a3cd5d8801b9aef4da2a38..9c34e3e6e605ddcf501a0cec7a863a9dcf018702 100644 (file)
--- a/ssh.0
+++ b/ssh.0
@@ -1016,4 +1016,4 @@ AUTHORS
      created OpenSSH.  Markus Friedl contributed the support for SSH protocol
      versions 1.5 and 2.0.
 
-OpenBSD 7.5                      June 27, 2024                     OpenBSD 7.5
+OpenBSD 7.7                      June 27, 2024                     OpenBSD 7.7

diff --git a/ssh_config.0 b/ssh_config.0
index ef6c0936a1c45c0a9cd739e59b51cd321586ad38..f9a82781b9dd7f50c4e7b22afd0fe97f738c39fa 100644 (file)
--- a/ssh_config.0
+++ b/ssh_config.0
@@ -1428,4 +1428,4 @@ AUTHORS
      created OpenSSH.  Markus Friedl contributed the support for SSH protocol
      versions 1.5 and 2.0.
 
-OpenBSD 7.5                      June 17, 2024                     OpenBSD 7.5
+OpenBSD 7.7                      June 17, 2024                     OpenBSD 7.7

diff --git a/sshd.0 b/sshd.0
index c7de2d31188b2c2e7b351a4d01fbd9805b54714f..eac127dcfcf5e8d4e8fe7a4b719bc9c5b7944c9d 100644 (file)
--- a/sshd.0
+++ b/sshd.0
@@ -682,4 +682,4 @@ AUTHORS
      versions 1.5 and 2.0.  Niels Provos and Markus Friedl contributed support
      for privilege separation.
 
-OpenBSD 7.5                      June 17, 2024                     OpenBSD 7.5
+OpenBSD 7.7                      June 17, 2024                     OpenBSD 7.7

diff --git a/sshd_config.0 b/sshd_config.0
index 6883dda4b196d803ad8075941259765870964d1b..ca030fcca68bd21640f57f4e14375d7ee12af74a 100644 (file)
--- a/sshd_config.0
+++ b/sshd_config.0
@@ -950,8 +950,8 @@ DESCRIPTION
              accumulated.
 
              Penalties are enabled by default with the default settings listed
-             below but may disabled using the off keyword.  The defaults may
-             be overridden by specifying one or more of the keywords below,
+             below but may disabled using the no keyword.  The defaults may be
+             overridden by specifying one or more of the keywords below,
              separated by whitespace.  All keywords accept arguments, e.g.
              "crash:2m".
 
@@ -1390,4 +1390,4 @@ AUTHORS
      versions 1.5 and 2.0.  Niels Provos and Markus Friedl contributed support
      for privilege separation.
 
-OpenBSD 7.5                      June 24, 2024                     OpenBSD 7.5
+OpenBSD 7.7                      June 24, 2024                     OpenBSD 7.7