diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2020-07-15 04:55:48 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2020-07-15 04:55:48 +0000 |
| commit | 9cf813796fbfe08afb1b7a5f38ba364a33cb61cf (patch) | |
| tree | 62b1645467ea2424fc9600445048daf3947e66a1 /regress | |
| parent | 74a60af022038562dc800d217f3e5ed8eeb84241 (diff) | |
Use $OBJ to find key files. Fixes test when run on an obj directory
(on OpenBSD) or out of tree (in Portable).
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/usr.bin/ssh/agent.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/regress/usr.bin/ssh/agent.sh b/regress/usr.bin/ssh/agent.sh index 66973de2b5f..a3ad1385f48 100644 --- a/regress/usr.bin/ssh/agent.sh +++ b/regress/usr.bin/ssh/agent.sh @@ -1,4 +1,4 @@ -# $OpenBSD: agent.sh,v 1.18 2020/06/26 05:12:21 djm Exp $ +# $OpenBSD: agent.sh,v 1.19 2020/07/15 04:55:47 dtucker Exp $ # Placed in the Public Domain. tid="simple agent test" @@ -197,7 +197,7 @@ check_key_present() { # delete the ed25519 key trace "delete single key by file" -${SSHADD} -qdk ssh-ed25519-agent || fail "ssh-add -d ed25519 failed" +${SSHADD} -qdk $OBJ/ssh-ed25519-agent || fail "ssh-add -d ed25519 failed" check_key_absent ssh-ed25519 check_key_present ssh-ed25519-cert-v01@openssh.com # Put key/cert back. @@ -206,7 +206,7 @@ ${SSHADD} $OBJ/ssh-ed25519-agent-private >/dev/null 2>&1 || \ check_key_present ssh-ed25519 # Delete both key and certificate. trace "delete key/cert by file" -${SSHADD} -qd ssh-ed25519-agent || fail "ssh-add -d ed25519 failed" +${SSHADD} -qd $OBJ/ssh-ed25519-agent || fail "ssh-add -d ed25519 failed" check_key_absent ssh-ed25519 check_key_absent ssh-ed25519-cert-v01@openssh.com # Put key/cert back. @@ -214,11 +214,11 @@ ${SSHADD} $OBJ/ssh-ed25519-agent-private >/dev/null 2>&1 || \ fail "ssh-add failed exit code $?" check_key_present ssh-ed25519 # Delete certificate via stdin -${SSHADD} -qd - < ssh-ed25519-agent-cert.pub || fail "ssh-add -d - failed" +${SSHADD} -qd - < $OBJ/ssh-ed25519-agent-cert.pub || fail "ssh-add -d - failed" check_key_present ssh-ed25519 check_key_absent ssh-ed25519-cert-v01@openssh.com # Delete key via stdin -${SSHADD} -qd - < ssh-ed25519-agent.pub || fail "ssh-add -d - failed" +${SSHADD} -qd - < $OBJ/ssh-ed25519-agent.pub || fail "ssh-add -d - failed" check_key_absent ssh-ed25519 check_key_absent ssh-ed25519-cert-v01@openssh.com |