[rpms/gsi-openssh] epel8: Based on openssh-8.0p1-29.el8_10

[rpms/gsi-openssh] epel8: Based on openssh-8.0p1-29.el8_10

[Mattias Ellert]

A new commit has been pushed.

Repo   : rpms/gsi-openssh
Branch : epel8
Commit : 1a900edeb0a592a0334ce4e25b328e3a3bf48f95
Author : Mattias Ellert <mattias.ellert@physics.uu.se>
Date   : 2026-05-29T08:13:04+02:00
Stats  : +618/-1 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/gsi-openssh/c/1a900edeb0a592a0334ce4e25b328e3a3bf48f95?branch=epel8

Log:
Based on openssh-8.0p1-29.el8_10

---
diff --git a/gsi-openssh.spec b/gsi-openssh.spec
index 423a949..3b675aa 100644
--- a/gsi-openssh.spec
+++ b/gsi-openssh.spec
@@ -31,7 +31,7 @@
 %global ldap 1
 
 %global openssh_ver 8.0p1
-%global openssh_rel 17
+%global openssh_rel 18
 
 Summary: An implementation of the SSH protocol with GSI authentication
 Name: gsi-openssh
@@ -245,6 +245,19 @@ Patch1022: openssh-8.0p1-CVE-2025-26465.patch
 Patch1023: openssh-8.0p1-reject-cntrl-chars-in-username.patch
 # upstream 43b3bff47bb029f2299bacb6a36057981b39fdb0
 Patch1024: openssh-8.7p1-reject-null-char-in-url-string.patch
+# upstream 487e8ac146f7d6616f65c125d5edb210519b833a
+Patch1025: openssh-9.9p1-scp-clear-setuid.patch
+# upstream c805b97b67c774e0bf922ffb29dfbcda9d7b5add
+Patch1026: openssh-8.0p1-mux-askpass-check.patch
+# upstream fd1c7e131f331942d20f42f31e79912d570081fa
+Patch1027: openssh-8.0p1-ecdsa-incomplete-application.patch
+# upstream fd1c7e131f331942d20f42f31e79912d570081fa
+Patch1028: openssh-8.7p1-authorized-keys-principles-option.patch
+# upstream 76685c9b09a66435cd2ad8373246adf1c53976d3
+# upstream 0a0ef4515361143cad21afa072319823854c1cf6
+# upstream 607bd871ec029e9aa22e632a22547250f3cae223
+# upstream 1340d3fa8e4bb122906a82159c4c9b91584d65ce
+Patch1029: openssh-8.0p1-proxyjump-username-validity-checks.patch
 
 # This is the patch that adds GSI support
 # Based on hpn_isshd-gsi.7.5p1b.patch from Globus upstream
@@ -439,6 +452,11 @@ gpgv2 --quiet --keyring %{SOURCE3} %{SOURCE1} %{SOURCE0}
 %patch -P1022 -p2 -b .cve-2025-26465
 %patch -P1023 -p1 -b .reject-cntrl-chars-in-username
 %patch -P1024 -p1 -b .reject-null-char-in-url-string
+%patch -P1025 -p1 -b .scp-clear-setuid
+%patch -P1026 -p1 -b .mux-askpass-check
+%patch -P1027 -p1 -b .ecdsa-incomplete-application
+%patch -P1028 -p1 -b .authorized-keys-principles-option
+%patch -P1029 -p1 -b .proxyjump-username-validity-checks
 
 %patch -P98 -p1 -b .gsi
 %patch -P99 -p1 -b .hpn
@@ -641,6 +659,9 @@ getent passwd sshd >/dev/null || \
 %attr(0644,root,root) %{_tmpfilesdir}/gsissh.conf
 
 %changelog
+* Fri May 29 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 8.0p1-18
+- Based on openssh-8.0p1-29.el8_10
+
 * Fri Jan 16 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 8.0p1-17
 - Based on openssh-8.0p1-27.el8_10
 

diff --git a/openssh-8.0p1-ecdsa-incomplete-application.patch b/openssh-8.0p1-ecdsa-incomplete-application.patch
new file mode 100644
index 0000000..d9055dd
--- /dev/null
+++ b/openssh-8.0p1-ecdsa-incomplete-application.patch
@@ -0,0 +1,99 @@
+diff --color -ruNp a/auth2-hostbased.c b/auth2-hostbased.c
+--- a/auth2-hostbased.c	2026-04-15 12:41:41.506985043 +0200
++++ b/auth2-hostbased.c	2026-04-15 12:55:55.039916421 +0200
+@@ -96,9 +96,10 @@ userauth_hostbased(struct ssh *ssh)
+ 		error("%s: cannot decode key: %s", __func__, pkalg);
+ 		goto done;
+ 	}
+-	if (key->type != pktype) {
+-		error("%s: type mismatch for decoded key "
+-		    "(received %d, expected %d)", __func__, key->type, pktype);
++	if (key->type != pktype || (sshkey_type_plain(pktype) == KEY_ECDSA &&
++	    sshkey_ecdsa_nid_from_name(pkalg) != key->ecdsa_nid)) {
++		error("%s: key type mismatch for decoded key "
++		    "(received %s, expected %s)", __func__, sshkey_ssh_name(key), pkalg);
+ 		goto done;
+ 	}
+ 	if (sshkey_type_plain(key->type) == KEY_RSA &&
+diff --color -ruNp a/auth2-pubkey.c b/auth2-pubkey.c
+--- a/auth2-pubkey.c	2026-04-15 12:41:41.507225986 +0200
++++ b/auth2-pubkey.c	2026-04-15 12:55:06.559875789 +0200
+@@ -136,9 +136,10 @@ userauth_pubkey(struct ssh *ssh)
+ 		error("%s: cannot decode key: %s", __func__, pkalg);
+ 		goto done;
+ 	}
+-	if (key->type != pktype) {
+-		error("%s: type mismatch for decoded key "
+-		    "(received %d, expected %d)", __func__, key->type, pktype);
++	if (key->type != pktype || (sshkey_type_plain(pktype) == KEY_ECDSA &&
++	    sshkey_ecdsa_nid_from_name(pkalg) != key->ecdsa_nid)) {
++		error("%s: key type mismatch for decoded key "
++		    "(received %s, expected %s)", __func__, sshkey_ssh_name(key), pkalg);
+ 		goto done;
+ 	}
+ 	if (sshkey_type_plain(key->type) == KEY_RSA &&
+diff --color -ruNp a/sshconnect2.c b/sshconnect2.c
+--- a/sshconnect2.c	2026-04-15 12:41:41.546573648 +0200
++++ b/sshconnect2.c	2026-04-15 12:47:56.862867930 +0200
+@@ -91,10 +91,15 @@ u_int session_id2_len = 0;
+ 
+ char *xxx_host;
+ struct sockaddr *xxx_hostaddr;
++static int key_type_allowed(struct sshkey *, const char *);
+ 
+ static int
+ verify_host_key_callback(struct sshkey *hostkey, struct ssh *ssh)
+ {
++	if (!key_type_allowed(hostkey, options.hostkeyalgorithms)) {
++		fatal("Server host key %s not in HostKeyAlgorithms",
++		    sshkey_ssh_name(hostkey));
++	}
+ 	if (verify_host_key(xxx_host, xxx_hostaddr, hostkey) != 0)
+ 		fatal("Host key verification failed.");
+ 	return 0;
+@@ -1662,34 +1667,36 @@ load_identity_file(Identity *id)
+ }
+ 
+ static int
+-key_type_allowed_by_config(struct sshkey *key)
++key_type_allowed(struct sshkey *key, const char *allowlist)
+ {
+-	if (match_pattern_list(sshkey_ssh_name(key),
+-	    options.pubkey_key_types, 0) == 1)
++	if (match_pattern_list(sshkey_ssh_name(key), allowlist, 0) == 1)
+ 		return 1;
+ 
+ 	/* RSA keys/certs might be allowed by alternate signature types */
+ 	switch (key->type) {
+ 	case KEY_RSA:
+-		if (match_pattern_list("rsa-sha2-512",
+-		    options.pubkey_key_types, 0) == 1)
++		if (match_pattern_list("rsa-sha2-512", allowlist, 0) == 1)
+ 			return 1;
+-		if (match_pattern_list("rsa-sha2-256",
+-		    options.pubkey_key_types, 0) == 1)
++		if (match_pattern_list("rsa-sha2-256", allowlist, 0) == 1)
+ 			return 1;
+ 		break;
+ 	case KEY_RSA_CERT:
+ 		if (match_pattern_list("rsa-sha2-512-cert-v01@openssh.com",
+-		    options.pubkey_key_types, 0) == 1)
++		    allowlist, 0) == 1)
+ 			return 1;
+ 		if (match_pattern_list("rsa-sha2-256-cert-v01@openssh.com",
+-		    options.pubkey_key_types, 0) == 1)
++		    allowlist, 0) == 1)
+ 			return 1;
+ 		break;
+ 	}
+ 	return 0;
+ }
+ 
++static int
++key_type_allowed_by_config(struct sshkey *key)
++{
++	return key_type_allowed(key, options.pubkey_key_types);
++}
+ 
+ /*
+  * try keys in the following order:

diff --git a/openssh-8.0p1-mux-askpass-check.patch b/openssh-8.0p1-mux-askpass-check.patch
new file mode 100644
index 0000000..ea28144
--- /dev/null
+++ b/openssh-8.0p1-mux-askpass-check.patch
@@ -0,0 +1,20 @@
+diff --color -ruNp a/mux.c b/mux.c
+--- a/mux.c	2026-04-15 12:22:36.533931440 +0200
++++ b/mux.c	2026-04-15 12:24:40.020578991 +0200
+@@ -1133,6 +1133,16 @@ mux_master_process_proxy(struct ssh *ssh
+ 
+ 	debug("%s: channel %d: proxy request", __func__, c->self);
+ 
++	if (options.control_master == SSHCTL_MASTER_ASK ||
++	    options.control_master == SSHCTL_MASTER_AUTO_ASK) {
++		if (!ask_permission("Allow multiplex proxy connection?")) {
++			debug2("%s: proxy refused by user", __func__);
++			reply_error(reply, MUX_S_PERMISSION_DENIED, rid,
++			    "Permission denied");
++			return 0;
++		}
++	}
++
+ 	c->mux_rcb = channel_proxy_downstream;
+ 	if ((r = sshbuf_put_u32(reply, MUX_S_PROXY)) != 0 ||
+ 	    (r = sshbuf_put_u32(reply, rid)) != 0)

diff --git a/openssh-8.0p1-proxyjump-username-validity-checks.patch b/openssh-8.0p1-proxyjump-username-validity-checks.patch
new file mode 100644
index 0000000..8cb9526
--- /dev/null
+++ b/openssh-8.0p1-proxyjump-username-validity-checks.patch
@@ -0,0 +1,425 @@
+diff --color -ruNp a/misc.c b/misc.c
+--- a/misc.c	2026-04-15 13:31:07.822096096 +0200
++++ b/misc.c	2026-04-15 13:33:04.228235182 +0200
+@@ -89,6 +89,20 @@ chop(char *s)
+ 
+ }
+ 
++/* remove whitespace from end of string */
++void
++rtrim(char *s)
++{
++	size_t i;
++
++	if ((i = strlen(s)) == 0)
++		return;
++	for (i--; i > 0; i--) {
++		if (isspace((int)s[i]))
++			s[i] = '\0';
++	}
++}
++
+ /* set/unset filedescriptor to non-blocking */
+ int
+ set_nonblock(int fd)
+diff --color -ruNp a/misc.h b/misc.h
+--- a/misc.h	2019-04-18 00:52:57.000000000 +0200
++++ b/misc.h	2026-04-15 13:33:13.656428006 +0200
+@@ -44,6 +44,7 @@ struct ForwardOptions {
+ /* misc.c */
+ 
+ char	*chop(char *);
++void	 rtrim(char *);
+ char	*strdelim(char **);
+ char	*strdelimw(char **);
+ int	 set_nonblock(int);
+diff --color -ruNp a/readconf.c b/readconf.c
+--- a/readconf.c	2026-04-15 13:31:07.787080808 +0200
++++ b/readconf.c	2026-04-15 13:31:40.930531592 +0200
+@@ -1195,9 +1195,6 @@ parse_char_array:
+ 
+ 	case oProxyCommand:
+ 		charptr = &options->proxy_command;
+-		/* Ignore ProxyCommand if ProxyJump already specified */
+-		if (options->jump_host != NULL)
+-			charptr = &options->jump_host; /* Skip below */
+ parse_command:
+ 		if (s == NULL)
+ 			fatal("%.200s line %d: Missing argument.", filename, linenum);
+@@ -1212,7 +1209,7 @@ parse_command:
+ 			    filename, linenum);
+ 		}
+ 		len = strspn(s, WHITESPACE "=");
+-		if (parse_jump(s + len, options, *activep) == -1) {
++		if (parse_jump(s + len, options, cmdline, *activep) == -1) {
+ 			fatal("%.200s line %d: Invalid ProxyJump \"%s\"",
+ 			    filename, linenum, s + len);
+ 		}
+@@ -2440,57 +2437,116 @@ parse_forward(struct Forward *fwd, const
+ }
+ 
+ int
+-parse_jump(const char *s, Options *o, int active)
++ssh_valid_hostname(const char *s)
+ {
+-	char *orig, *sdup, *cp;
+-	char *host = NULL, *user = NULL;
+-	int ret = -1, port = -1, first;
++	size_t i;
+ 
+-	active &= o->proxy_command == NULL && o->jump_host == NULL;
++	if (*s == '-')
++		return 0;
++	for (i = 0; s[i] != 0; i++) {
++		if (strchr("'`\"$\\;&<>|(){},", s[i]) != NULL ||
++		    isspace((u_char)s[i]) || iscntrl((u_char)s[i]))
++			return 0;
++	}
++	return 1;
++}
++
++int
++ssh_valid_ruser(const char *s)
++{
++	size_t i;
++
++	if (*s == '-')
++		return 0;
++	for (i = 0; s[i] != 0; i++) {
++		if (iscntrl((u_char)s[i]))
++			return 0;
++		if (strchr("'`\";&<>|(){}", s[i]) != NULL)
++			return 0;
++		/* Disallow '-' after whitespace */
++		if (isspace((u_char)s[i]) && s[i + 1] == '-')
++			return 0;
++		/* Disallow \ in last position */
++		if (s[i] == '\\' && s[i + 1] == '\0')
++			return 0;
++	}
++	return 1;
++}
++
++int
++parse_jump(const char *s, Options *o, int strict, int active)
++{
++	char *orig = NULL, *sdup = NULL, *cp;
++	char *tmp_user = NULL, *tmp_host = NULL, *host = NULL, *user = NULL;
++	int r, ret = -1, tmp_port = -1, port = -1, first = 1;
++
++	if (strcasecmp(s, "none") == 0) {
++		if (active && o->jump_host == NULL) {
++			o->jump_host = xstrdup("none");
++			o->jump_port = 0;
++		}
++		return 0;
++	}
++
++	orig = xstrdup(s);
++	if ((cp = strchr(orig, '#')) != NULL)
++		*cp = '\0';
++	rtrim(orig);
+ 
+-	orig = sdup = xstrdup(s);
+-	first = active;
++	active &= o->proxy_command == NULL && o->jump_host == NULL;
++	sdup = xstrdup(orig);
+ 	do {
+-		if (strcasecmp(s, "none") == 0)
+-			break;
++		/* Work backwards through string */
+ 		if ((cp = strrchr(sdup, ',')) == NULL)
+ 			cp = sdup; /* last */
+ 		else
+ 			*cp++ = '\0';
+ 
+-		if (first) {
+-			/* First argument and configuration is active */
+-			if (parse_ssh_uri(cp, &user, &host, &port) == -1 ||
+-			    parse_user_host_port(cp, &user, &host, &port) != 0)
++		r = parse_ssh_uri(cp, &tmp_user, &tmp_host, &tmp_port);
++		if (r == -1 || (r == 1 && parse_user_host_port(cp,
++		    &tmp_user, &tmp_host, &tmp_port) != 0))
++			goto out; /* error already logged */
++		if (strict) {
++			if (!ssh_valid_hostname(tmp_host)) {
++				error("%s: invalid hostname \"%s\"", __func__, tmp_host);
+ 				goto out;
+-		} else {
+-			/* Subsequent argument or inactive configuration */
+-			if (parse_ssh_uri(cp, NULL, NULL, NULL) == -1 ||
+-			    parse_user_host_port(cp, NULL, NULL, NULL) != 0)
++			}
++			if (tmp_user != NULL && !ssh_valid_ruser(tmp_user)) {
++				error("%s: invalid username \"%s\"", __func__, tmp_user);
+ 				goto out;
++			}
++		}
++		if (first) {
++			user = tmp_user;
++			host = tmp_host;
++			port = tmp_port;
++			tmp_user = tmp_host = NULL; /* transferred */
+ 		}
+ 		first = 0; /* only check syntax for subsequent hosts */
++		free(tmp_user);
++		free(tmp_host);
++		tmp_user = tmp_host = NULL;
++		tmp_port = -1;
+ 	} while (cp != sdup);
++
+ 	/* success */
+ 	if (active) {
+-		if (strcasecmp(s, "none") == 0) {
+-			o->jump_host = xstrdup("none");
+-			o->jump_port = 0;
+-		} else {
+-			o->jump_user = user;
+-			o->jump_host = host;
+-			o->jump_port = port;
+-			o->proxy_command = xstrdup("none");
+-			user = host = NULL;
+-			if ((cp = strrchr(s, ',')) != NULL && cp != s) {
+-				o->jump_extra = xstrdup(s);
+-				o->jump_extra[cp - s] = '\0';
+-			}
++		o->jump_user = user;
++		o->jump_host = host;
++		o->jump_port = port;
++		o->proxy_command = xstrdup("none");
++		user = host = NULL; /* transferred */
++		if (orig != NULL && (cp = strrchr(orig, ',')) != NULL) {
++			o->jump_extra = xstrdup(orig);
++			o->jump_extra[cp - orig] = '\0';
+ 		}
+ 	}
+ 	ret = 0;
+  out:
+ 	free(orig);
++	free(sdup);
++	free(tmp_user);
++	free(tmp_host);
+ 	free(user);
+ 	free(host);
+ 	return ret;
+diff --color -ruNp a/readconf.h b/readconf.h
+--- a/readconf.h	2026-04-15 13:31:07.615351090 +0200
++++ b/readconf.h	2026-04-15 13:31:40.931797538 +0200
+@@ -211,7 +211,9 @@ int	 process_config_line(Options *, stru
+ int	 read_config_file(const char *, struct passwd *, const char *,
+     const char *, Options *, int, int *);
+ int	 parse_forward(struct Forward *, const char *, int, int);
+-int	 parse_jump(const char *, Options *, int);
++int	 ssh_valid_hostname(const char *);
++int	 ssh_valid_ruser(const char *);
++int	 parse_jump(const char *, Options *, int, int);
+ int	 parse_ssh_uri(const char *, char **, char **, int *);
+ int	 default_ssh_port(void);
+ int	 option_clear_or_none(const char *);
+diff --color -ruNp a/regress/Makefile b/regress/Makefile
+--- a/regress/Makefile	2026-04-15 13:31:07.748508810 +0200
++++ b/regress/Makefile	2026-04-15 13:31:40.932487948 +0200
+@@ -84,7 +84,8 @@ LTESTS= 	connect \
+ 		cfginclude \
+ 		servcfginclude \
+ 		allow-deny-users \
+-		authinfo
++		authinfo \
++		proxyjump
+ 
+ 
+ #		dhgex \
+diff --color -ruNp a/regress/proxyjump.sh b/regress/proxyjump.sh
+--- a/regress/proxyjump.sh	1970-01-01 01:00:00.000000000 +0100
++++ b/regress/proxyjump.sh	2026-04-15 13:31:40.932813345 +0200
+@@ -0,0 +1,102 @@
++#	$OpenBSD: proxyjump.sh,v 1.1 2026/03/30 07:19:02 djm Exp $
++#	Placed in the Public Domain.
++
++tid="proxyjump"
++
++# Parsing tests
++verbose "basic parsing"
++for jspec in \
++	"jump1" \
++	"user@jump1" \
++	"jump1:2222" \
++	"user@jump1:2222" \
++	"jump1,jump2" \
++	"user1@jump1:2221,user2@jump2:2222" \
++	"ssh://user@host:2223" \
++	; do
++	case "$jspec" in
++	"jump1")		expected="jump1" ;;
++	"user@jump1")		expected="user@jump1" ;;
++	"jump1:2222")		expected="jump1:2222" ;;
++	"user@jump1:2222")	expected="user@jump1:2222" ;;
++	"jump1,jump2")		expected="jump1,jump2" ;;
++	"user1@jump1:2221,user2@jump2:2222")
++		expected="user1@jump1:2221,user2@jump2:2222" ;;
++	"ssh://user@host:2223")	expected="user@host:2223" ;;
++	esac
++	f=`${SSH} -GF /dev/null -oProxyJump="$jspec" somehost | \
++		awk '/^proxyjump /{print $2}'`
++	if [ "$f" != "$expected" ]; then
++		fail "ProxyJump $jspec: expected $expected, got $f"
++	fi
++	f=`${SSH} -GF /dev/null -J "$jspec" somehost | \
++		awk '/^proxyjump /{print $2}'`
++	if [ "$f" != "$expected" ]; then
++		fail "ssh -J $jspec: expected $expected, got $f"
++	fi
++done
++
++verbose "precedence"
++f=`${SSH} -GF /dev/null -oProxyJump=none -oProxyJump=jump1 somehost | \
++	grep "^proxyjump "`
++if [ -n "$f" ]; then
++	fail "ProxyJump=none first did not win"
++fi
++f=`${SSH} -GF /dev/null -oProxyJump=jump -oProxyCommand=foo somehost | \
++	grep "^proxyjump "`
++if [ "$f" != "proxyjump jump" ]; then
++	fail "ProxyJump first did not win over ProxyCommand"
++fi
++f=`${SSH} -GF /dev/null -oProxyCommand=foo -oProxyJump=jump somehost | \
++	grep "^proxycommand "`
++if [ "$f" != "proxycommand foo" ]; then
++	fail "ProxyCommand first did not win over ProxyJump"
++fi
++
++verbose "command-line -J invalid characters"
++cp $OBJ/ssh_config $OBJ/ssh_config.orig
++for jspec in \
++	"host;with;semicolon" \
++	"host'with'quote" \
++	"host\`with\`backtick" \
++	"host\$with\$dollar" \
++	"host(with)brace" \
++	"user;with;semicolon@host" \
++	"user'with'quote@host" \
++	"user\`with\`backtick@host" \
++	"user(with)brace@host" ; do
++	${SSH} -GF /dev/null -J "$jspec" somehost >/dev/null 2>&1
++	if [ $? -ne 255 ]; then
++		fail "ssh -J \"$jspec\" was not rejected"
++	fi
++	${SSH} -GF /dev/null -oProxyJump="$jspec" somehost >/dev/null 2>&1
++	if [ $? -ne 255 ]; then
++		fail "ssh -oProxyJump=\"$jspec\" was not rejected"
++	fi
++done
++# Special characters should be accepted in the config though.
++echo "ProxyJump user;with;semicolon@host;with;semicolon" >> $OBJ/ssh_config
++f=`${SSH} -GF $OBJ/ssh_config somehost | grep "^proxyjump "`
++if [ "$f" != "proxyjump user;with;semicolon@host;with;semicolon" ]; then
++	fail "ProxyJump did not allow special characters in config: $f"
++fi
++
++verbose "functional test"
++# Use different names to avoid the loop detection in ssh.c
++grep -iv HostKeyAlias $OBJ/ssh_config.orig > $OBJ/ssh_config
++cat << _EOF >> $OBJ/ssh_config
++Host jump-host
++	HostkeyAlias jump-host
++Host target-host
++	HostkeyAlias target-host
++_EOF
++cp $OBJ/known_hosts $OBJ/known_hosts.orig
++sed 's/^[^ ]* /jump-host /' < $OBJ/known_hosts.orig > $OBJ/known_hosts
++sed 's/^[^ ]* /target-host /' < $OBJ/known_hosts.orig >> $OBJ/known_hosts
++start_sshd
++
++verbose "functional ProxyJump"
++res=`${REAL_SSH} -F $OBJ/ssh_config -J jump-host target-host echo "SUCCESS" 2>/dev/null`
++if [ "$res" != "SUCCESS" ]; then
++	fail "functional test failed: expected SUCCESS, got $res"
++fi
+diff --color -ruNp a/ssh.c b/ssh.c
+--- a/ssh.c	2026-04-15 13:31:07.820492902 +0200
++++ b/ssh.c	2026-04-15 13:31:40.933136324 +0200
+@@ -576,43 +576,6 @@ set_addrinfo_port(struct addrinfo *addrs
+ 	}
+ }
+ 
+-static int
+-valid_hostname(const char *s)
+-{
+-	size_t i;
+-
+-	if (*s == '-')
+-		return 0;
+-	for (i = 0; s[i] != 0; i++) {
+-		if (strchr("'`\"$\\;&<>|(){}", s[i]) != NULL ||
+-		    isspace((u_char)s[i]) || iscntrl((u_char)s[i]))
+-			return 0;
+-	}
+-	return 1;
+-}
+-
+-static int
+-valid_ruser(const char *s)
+-{
+-	size_t i;
+-
+-	if (*s == '-')
+-		return 0;
+-	for (i = 0; s[i] != 0; i++) {
+-		if (iscntrl((u_char)s[i]))
+-			return 0;
+-		if (strchr("'`\";&<>|(){}", s[i]) != NULL)
+-			return 0;
+-		/* Disallow '-' after whitespace */
+-		if (isspace((u_char)s[i]) && s[i + 1] == '-')
+-			return 0;
+-		/* Disallow \ in last position */
+-		if (s[i] == '\\' && s[i + 1] == '\0')
+-			return 0;
+-	}
+-	return 1;
+-}
+-
+ /*
+  * Main program for the ssh client.
+  */
+@@ -842,9 +805,9 @@ main(int ac, char **av)
+ 				fatal("Only a single -J option permitted");
+ 			if (options.proxy_command != NULL)
+ 				fatal("Cannot specify -J with ProxyCommand");
+-			if (parse_jump(optarg, &options, 1) == -1)
++			if (parse_jump(optarg, &options, 1, 1) == -1)
++
+ 				fatal("Invalid -J argument");
+-			options.proxy_command = xstrdup("none");
+ 			break;
+ 		case 't':
+ 			if (options.request_tty == REQUEST_TTY_YES)
+@@ -1085,10 +1048,15 @@ main(int ac, char **av)
+ 	if (!host)
+ 		usage();
+ 
+-	if (!valid_hostname(host))
+-		fatal("hostname contains invalid characters");
+-	if (options.user != NULL && !valid_ruser(options.user))
++	/*
++	 * Validate commandline-specified values that end up in %tokens
++	 * before they are used in config parsing.
++	 */
++	if (options.user != NULL && !ssh_valid_ruser(options.user))
+ 		fatal("remote username contains invalid characters");
++	if (!ssh_valid_hostname(host))
++		fatal("hostname contains invalid characters");
++
+ 	host_arg = xstrdup(host);
+ 
+ 	/* Initialize the command to execute on remote host. */
+@@ -1249,7 +1217,8 @@ main(int ac, char **av)
+ 			sshbin = "ssh";
+ 
+ 		/* Consistency check */
+-		if (options.proxy_command != NULL)
++		if (options.proxy_command != NULL &&
++		    strcasecmp(options.proxy_command, "none") != 0)
+ 			fatal("inconsistent options: ProxyCommand+ProxyJump");
+ 		/* Never use FD passing for ProxyJump */
+ 		options.proxy_use_fdpass = 0;

diff --git a/openssh-8.7p1-authorized-keys-principles-option.patch b/openssh-8.7p1-authorized-keys-principles-option.patch
new file mode 100644
index 0000000..3c547c3
--- /dev/null
+++ b/openssh-8.7p1-authorized-keys-principles-option.patch
@@ -0,0 +1,37 @@
+diff --color -ruNp a/auth2-pubkey.c b/auth2-pubkey.c
+--- a/auth2-pubkey.c	2026-04-13 15:13:58.759515611 +0200
++++ b/auth2-pubkey.c	2026-04-13 15:20:28.131029727 +0200
+@@ -329,20 +329,23 @@ user_key_verify(struct ssh *ssh, const s
+ static int
+ match_principals_option(const char *principal_list, struct sshkey_cert *cert)
+ {
+-	char *result;
++	char *list, *olist, *entry;
+ 	u_int i;
+ 
+-	/* XXX percent_expand() sequences for authorized_principals? */
+-
+-	for (i = 0; i < cert->nprincipals; i++) {
+-		if ((result = match_list(cert->principals[i],
+-		    principal_list, NULL)) != NULL) {
+-			debug3("matched principal from key options \"%.100s\"",
+-			    result);
+-			free(result);
+-			return 1;
++	olist = list = xstrdup(principal_list);
++	for (;;) {
++		if ((entry = strsep(&list, ",")) == NULL || *entry == '\0')
++			break;
++		for (i = 0; i < cert->nprincipals; i++) {
++			if (strcmp(entry, cert->principals[i]) == 0) {
++				debug3("matched principal from key i"
++				    "options \"%.100s\"", entry);
++				free(olist);
++				return 1;
++			}
+ 		}
+ 	}
++	free(olist);
+ 	return 0;
+ }
+ 

diff --git a/openssh-9.9p1-scp-clear-setuid.patch b/openssh-9.9p1-scp-clear-setuid.patch
new file mode 100644
index 0000000..1a848a1
--- /dev/null
+++ b/openssh-9.9p1-scp-clear-setuid.patch
@@ -0,0 +1,15 @@
+diff --color -ruNp a/scp.c b/scp.c
+--- a/scp.c	2026-04-07 15:54:11.193730842 +0200
++++ b/scp.c	2026-04-07 15:55:52.529425481 +0200
+@@ -1705,8 +1705,10 @@ sink(int argc, char **argv, const char *
+ 
+ 	setimes = targisdir = 0;
+ 	mask = umask(0);
+-	if (!pflag)
++	if (!pflag) {
++		mask |= 07000;
+ 		(void) umask(mask);
++	}
+ 	if (argc != 1) {
+ 		run_err("ambiguous target");
+ 		exit(1);