[openssh-commits] [openssh] 01/02: upstream: When testing PKCS11, explicitly allow the module path in

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 5e7c3f33b2693b668ecfbac84b85f2c0c84410c2
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Mon Nov 24 23:54:15 2025 +0000

    upstream: When testing PKCS11, explicitly allow the module path in
    
    ssh-agent.
    
    Allows testing of PKCS11 modules outside system directories.
    
    From Morgan Jones via GHPR602
    
    OpenBSD-Regress-ID: 548d6e0362a8d9f7d1cc01444b697a00811ff488
---
 regress/test-exec.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index b38908cee..a47cc51dd 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: test-exec.sh,v 1.133 2025/10/21 07:18:27 dtucker Exp $
+#	$OpenBSD: test-exec.sh,v 1.134 2025/11/24 23:54:15 djm Exp $
 #	Placed in the Public Domain.
 
 #SUDO=sudo
@@ -1026,6 +1026,9 @@ p11_ssh_add() {
 
 start_ssh_agent() {
 	EXTRA_AGENT_ARGS="$1"
+	if [ "$PKCS11_OK" = "yes" ]; then
+		EXTRA_AGENT_ARGS="${EXTRA_AGENT_ARGS} -P${TEST_SSH_PKCS11}"
+	fi
 	SSH_AUTH_SOCK="$OBJ/agent.sock"
 	export SSH_AUTH_SOCK
 	rm -f $SSH_AUTH_SOCK $OBJ/agent.log

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.