summaryrefslogtreecommitdiff
path: root/regress/usr.bin/ssh/agent.sh
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2019-11-26 23:43:11 +0000
committerDamien Miller <djm@cvs.openbsd.org>2019-11-26 23:43:11 +0000
commitde43e991a9bd8ae79d59331adaf837496ac10c9f (patch)
treeba7f55753168461fadf55582a31009ab7ae95aa7 /regress/usr.bin/ssh/agent.sh
parent7f39780c28f0046c178de0fd6843df2fd92ed44e (diff)
test FIDO2/U2F key types; ok markus@
Diffstat (limited to 'regress/usr.bin/ssh/agent.sh')
-rw-r--r--regress/usr.bin/ssh/agent.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/regress/usr.bin/ssh/agent.sh b/regress/usr.bin/ssh/agent.sh
index 48fa12b0e2e..922d8436e81 100644
--- a/regress/usr.bin/ssh/agent.sh
+++ b/regress/usr.bin/ssh/agent.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: agent.sh,v 1.15 2019/07/23 07:39:43 dtucker Exp $
+# $OpenBSD: agent.sh,v 1.16 2019/11/26 23:43:10 djm Exp $
# Placed in the Public Domain.
tid="simple agent test"
@@ -8,8 +8,8 @@ if [ $? -ne 2 ]; then
fail "ssh-add -l did not fail with exit code 2"
fi
-trace "start agent"
-eval `${SSHAGENT} -s` > /dev/null
+trace "start agent, args ${EXTRA_AGENT_ARGS} -s"
+eval `${SSHAGENT} ${EXTRA_AGENT_ARGS} -s` > /dev/null
r=$?
if [ $r -ne 0 ]; then
fatal "could not start ssh-agent: exit code $r"
@@ -39,9 +39,9 @@ for t in ${SSH_KEYTYPES}; do
# add to authorized keys
cat $OBJ/$t-agent.pub >> $OBJ/authorized_keys_$USER
# add privat key to agent
- ${SSHADD} $OBJ/$t-agent > /dev/null 2>&1
+ ${SSHADD} $OBJ/$t-agent #> /dev/null 2>&1
if [ $? -ne 0 ]; then
- fail "ssh-add did succeed exit code 0"
+ fail "ssh-add failed exit code $?"
fi
# Remove private key to ensure that we aren't accidentally using it.
rm -f $OBJ/$t-agent