From: djm@openbsd.org <djm@openbsd.org>
Date: Wed, 11 Feb 2026 22:58:23 +0000 (+0000)
Subject: upstream: very basic testing of multiple files in RevokedKeys and
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae51e05dbd840ad674fee754f33c0e2fd141074e;p=thirdparty%2Fopenssh-portable.git

upstream: very basic testing of multiple files in RevokedKeys and

RevokedHostkeys

OpenBSD-Regress-ID: 6cee76bcc4bd6840bc8d39dd0d32d724e1427aa7
---

diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh
index f15512232..0c1607753 100644
--- a/regress/cert-hostkey.sh
+++ b/regress/cert-hostkey.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: cert-hostkey.sh,v 1.30 2025/12/22 03:36:43 djm Exp $
+#	$OpenBSD: cert-hostkey.sh,v 1.31 2026/02/11 22:58:23 djm Exp $
 #	Placed in the Public Domain.
 
 tid="certified host keys"
@@ -143,6 +143,8 @@ for ktype in $PLAIN_TYPES ; do
 	attempt_connect "$ktype basic connect"			"yes"
 	attempt_connect "$ktype empty KRL"			"yes" \
 	    -oRevokedHostKeys=$OBJ/host_krl_empty
+	attempt_connect "$ktype multiple KRL files"		"no" \
+	    -oRevokedHostKeys="/dev/null $OBJ/host_krl_plain"
 	attempt_connect "$ktype KRL w/ plain key revoked"	"no" \
 	    -oRevokedHostKeys=$OBJ/host_krl_plain
 	attempt_connect "$ktype KRL w/ cert revoked"		"no" \
diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh
index 6e2713bdd..c0decf065 100644
--- a/regress/cert-userkey.sh
+++ b/regress/cert-userkey.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: cert-userkey.sh,v 1.31 2025/12/22 01:50:46 djm Exp $
+#	$OpenBSD: cert-userkey.sh,v 1.32 2026/02/11 22:58:23 djm Exp $
 #	Placed in the Public Domain.
 
 tid="certified user keys"
@@ -226,7 +226,8 @@ basic_tests() {
 		verbose "$tid: ${_prefix} revoked key"
 		(
 			cat $OBJ/sshd_proxy_bak
-			echo "RevokedKeys $OBJ/cert_user_key_revoked"
+			# Also test multiple RevokedKeys files.
+			echo "RevokedKeys /dev/null $OBJ/cert_user_key_revoked"
 			echo "PubkeyAcceptedAlgorithms ${t}"
 			echo "$extra_sshd"
 		) > $OBJ/sshd_proxy