diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2019-11-27 00:43:10 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-11-27 01:02:49 +0100 |
| commit | ad44ca81bea83657d558aaef5a1d789a9032bac3 (patch) | |
| tree | c4143c62227e817790c3362d409cdef93b5b52da /regress/agent.sh | |
| parent | upstream: add dummy security key middleware based on work by (diff) | |
| download | openssh-ad44ca81bea83657d558aaef5a1d789a9032bac3.tar.xz openssh-ad44ca81bea83657d558aaef5a1d789a9032bac3.zip | |
upstream: test FIDO2/U2F key types; ok markus@
OpenBSD-Regress-ID: 367e06d5a260407619b4b113ea0bd7004a435474
Diffstat (limited to 'regress/agent.sh')
| -rw-r--r-- | regress/agent.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/regress/agent.sh b/regress/agent.sh index 48fa12b0e..922d8436e 100644 --- a/regress/agent.sh +++ b/regress/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 |