upstream: use start_ssh_agent() to ensure we get logging

add some verbosity

OpenBSD-Regress-ID: a89bf64696b9fb1b91be318e6b8940c9ab21c616

diff --git a/regress/agent-pkcs11.sh b/regress/agent-pkcs11.sh
index 304734f4b484af9fa1fe3f2b109f786732b2c372..731c1f9ddc9683e05034339e8b1ea33f6944b5da 100644 (file)
--- a/regress/agent-pkcs11.sh
+++ b/regress/agent-pkcs11.sh
@@ -1,54 +1,46 @@
-#      $OpenBSD: agent-pkcs11.sh,v 1.13 2023/10/30 23:00:25 djm Exp $
+#      $OpenBSD: agent-pkcs11.sh,v 1.14 2025/05/24 04:41:03 djm Exp $
 #      Placed in the Public Domain.
 
 tid="pkcs11 agent test"
 
 p11_setup || skip "No PKCS#11 library found"
 
-trace "start agent"
-eval `${SSHAGENT} ${EXTRA_AGENT_ARGS} -s` > /dev/null
+start_ssh_agent
+
+trace "add pkcs11 key to agent"
+p11_ssh_add -s ${TEST_SSH_PKCS11} > /dev/null 2>&1
 r=$?
 if [ $r -ne 0 ]; then
-       fail "could not start ssh-agent: exit code $r"
-else
-       trace "add pkcs11 key to agent"
-       p11_ssh_add -s ${TEST_SSH_PKCS11} > /dev/null 2>&1
-       r=$?
-       if [ $r -ne 0 ]; then
-               fail "ssh-add -s failed: exit code $r"
-       fi
+       fail "ssh-add -s failed: exit code $r"
+fi
 
-       trace "pkcs11 list via agent"
-       ${SSHADD} -l > /dev/null 2>&1
-       r=$?
-       if [ $r -ne 0 ]; then
-               fail "ssh-add -l failed: exit code $r"
-       fi
+trace "pkcs11 list via agent"
+${SSHADD} -l > /dev/null 2>&1
+r=$?
+if [ $r -ne 0 ]; then
+       fail "ssh-add -l failed: exit code $r"
+fi
 
-       for k in $RSA $EC; do
-               trace "testing $k"
-               pub=$(cat $k.pub)
-               ${SSHADD} -L | grep -q "$pub" || \
-                       fail "key $k missing in ssh-add -L"
-               ${SSHADD} -T $k.pub || fail "ssh-add -T with $k failed"
-
-               # add to authorized keys
-               cat $k.pub > $OBJ/authorized_keys_$USER
-               trace "pkcs11 connect via agent ($k)"
-               ${SSH} -F $OBJ/ssh_proxy somehost exit 5
-               r=$?
-               if [ $r -ne 5 ]; then
-                       fail "ssh connect failed (exit code $r)"
-               fi
-       done
-
-       trace "remove pkcs11 keys"
-       p11_ssh_add -e ${TEST_SSH_PKCS11} > /dev/null 2>&1
+for k in $RSA $EC; do
+       trace "testing $k"
+       pub=$(cat $k.pub)
+       ${SSHADD} -L | grep -q "$pub" || \
+               fail "key $k missing in ssh-add -L"
+       ${SSHADD} -T $k.pub || fail "ssh-add -T with $k failed"
+
+       # add to authorized keys
+       cat $k.pub > $OBJ/authorized_keys_$USER
+       trace "pkcs11 connect via agent ($k)"
+       ${SSH} -F $OBJ/ssh_proxy somehost exit 5
        r=$?
-       if [ $r -ne 0 ]; then
-               fail "ssh-add -e failed: exit code $r"
+       if [ $r -ne 5 ]; then
+               fail "ssh connect failed (exit code $r)"
        fi
+done
 
-       trace "kill agent"
-       ${SSHAGENT} -k > /dev/null
+trace "remove pkcs11 keys"
+p11_ssh_add -e ${TEST_SSH_PKCS11} > /dev/null 2>&1
+r=$?
+if [ $r -ne 0 ]; then
+       fail "ssh-add -e failed: exit code $r"
 fi