mention sntrup761x25519-sha512 in manpages

Spotted by Colin Watson
support sntrup761x25519-sha512 alias
2025-08-13 09:17:44 +10:00 · 2025-08-11 15:48:29 +10:00 · 2022-04-29 18:40:32 +10:00 · 2022-04-12 09:35:51 +10:00
9 changed files with 21 additions and 4 deletions
@@ -2,9 +2,11 @@ name: C/C++ CI

 on:
  push:
-    branches: [ master, ci ]
+    branches: [ master, ci, V_9_0 ]
+    paths: [ '**.c', '**.h', '**.m4', '**.sh', '**.yml', 'Makefile.in', 'configure.ac' ]
  pull_request:
    branches: [ master ]
+    paths: [ '**.c', '**.h', '**.m4', '**.sh', '**.yml', 'Makefile.in', 'configure.ac' ]

 jobs:
  ci:
@@ -2,7 +2,8 @@ name: C/C++ CI self-hosted

 on:
  push:
-    branches: [ master, ci ]
+    branches: [ master, ci, V_9_0 ]
+    paths: [ '**.c', '**.h', '**.m4', '**.sh', '**.yml', 'Makefile.in', 'configure.ac' ]

 jobs:
  selfhosted:
@@ -3,6 +3,7 @@ name: Upstream self-hosted
 on:
  push:
    branches: [ master, ci ]
+    paths: [ '**.c', '**.h' ]

 jobs:
  selfhosted:
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.415 2022/03/30 21:10:25 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.416 2022/04/11 22:52:08 djm Exp $ */
 /*
 * Author: Tatu Ylonen <ylo@cs.hut.fi>
 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2601,7 +2601,12 @@ channel_prepare_poll(struct ssh *ssh, struct pollfd **pfdp, u_int *npfd_allocp,
 	u_int i, oalloc, p, npfd = npfd_reserved;

 	channel_before_prepare_io(ssh); /* might create a new channel */
-
+	/* clear out I/O flags from last poll */
+	for (i = 0; i < sc->channels_alloc; i++) {
+		if (sc->channels[i] == NULL)
+			continue;
+		sc->channels[i]->io_want = sc->channels[i]->io_ready = 0;
+	}
 	/* Allocate 4x pollfd for each channel (rfd, wfd, efd, sock) */
 	if (sc->channels_alloc >= (INT_MAX / 4) - npfd_reserved)
 		fatal_f("too many channels"); /* shouldn't happen */
@@ -111,6 +111,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
@@ -63,6 +63,7 @@
 #define	KEX_CURVE25519_SHA256		"curve25519-sha256"
 #define	KEX_CURVE25519_SHA256_OLD	"[email protected]"
 #define	KEX_SNTRUP761X25519_SHA512	"[email protected]"
+#define	KEX_SNTRUP761X25519_SHA512_IANA	"sntrup761x25519-sha512"

 #define COMP_NONE	0
 /* pre-auth compression (COMP_ZLIB) is only supported in the client */
@@ -25,6 +25,7 @@
 */

 #define KEX_SERVER_KEX	\
+	"sntrup761x25519-sha512," \
 	"[email protected]," \
 	"curve25519-sha256," \
 	"[email protected]," \
@@ -1165,6 +1165,7 @@ character, then the specified algorithms will be placed at the head of the
 default set.
 The default is:
 .Bd -literal -offset indent
+sntrup761x25519-sha512,
 [email protected],
 curve25519-sha256,[email protected],
 ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
@@ -956,11 +956,14 @@ ecdh-sha2-nistp384
 .It
 ecdh-sha2-nistp521
 .It
+sntrup761x25519-sha512
+.It
 [email protected]
 .El
 .Pp
 The default is:
 .Bd -literal -offset indent
+sntrup761x25519-sha512,
 [email protected],
 curve25519-sha256,[email protected],
 ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
Author	SHA1	Message	Date
Damien Miller	73bd9c8b81	mention sntrup761x25519-sha512 in manpages Spotted by Colin Watson	2025-08-13 09:17:44 +10:00
Damien Miller	ade3fa2787	support sntrup761x25519-sha512 alias OpenSSH 9.0 supports the [email protected] 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.	2025-08-11 15:48:29 +10:00
Darren Tucker	660337a811	Only run tests when source files change. Also run tests on changes to V_9_0 branch.	2022-04-29 18:40:32 +10:00
[email protected]	2ea0157c66	upstream: clear io_want/io_ready flags at start of poll() cycle; avoids plausible spin during rekeying if channel io_want flags are reused across cycles. ok markus@ deraadt@ OpenBSD-Commit-ID: 91034f855b7c73cd2591657c49ac30f10322b967	2022-04-12 09:35:51 +10:00