diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2020-07-15 04:55:47 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2020-07-15 15:02:52 +1000 |
commit | 03da4c2b70468f04ed1c08518ea0a70e67232739 (patch) | |
tree | c43c8418bdc63c72eaf1d4a53052d4ba42937654 /regress | |
parent | 73f20f195ad18f1cf633eb7d8be95dc1b6111eea (diff) |
upstream: Use $OBJ to find key files. Fixes test when run on an obj
directory (on OpenBSD) or out of tree (in Portable).
OpenBSD-Regress-ID: 938fa8ac86adaa527d64a305bd2135cfbb1c0a17
Diffstat (limited to 'regress')
-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 66973de2b..a3ad1385f 100644 --- a/regress/agent.sh +++ b/regress/agent.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: agent.sh,v 1.18 2020/06/26 05:12:21 djm Exp $ | 1 | # $OpenBSD: agent.sh,v 1.19 2020/07/15 04:55:47 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="simple agent test" | 4 | tid="simple agent test" |
@@ -197,7 +197,7 @@ check_key_present() { | |||
197 | 197 | ||
198 | # delete the ed25519 key | 198 | # delete the ed25519 key |
199 | trace "delete single key by file" | 199 | trace "delete single key by file" |
200 | ${SSHADD} -qdk ssh-ed25519-agent || fail "ssh-add -d ed25519 failed" | 200 | ${SSHADD} -qdk $OBJ/ssh-ed25519-agent || fail "ssh-add -d ed25519 failed" |
201 | check_key_absent ssh-ed25519 | 201 | check_key_absent ssh-ed25519 |
202 | check_key_present ssh-ed25519-cert-v01@openssh.com | 202 | check_key_present ssh-ed25519-cert-v01@openssh.com |
203 | # Put key/cert back. | 203 | # Put key/cert back. |
@@ -206,7 +206,7 @@ ${SSHADD} $OBJ/ssh-ed25519-agent-private >/dev/null 2>&1 || \ | |||
206 | check_key_present ssh-ed25519 | 206 | check_key_present ssh-ed25519 |
207 | # Delete both key and certificate. | 207 | # Delete both key and certificate. |
208 | trace "delete key/cert by file" | 208 | trace "delete key/cert by file" |
209 | ${SSHADD} -qd ssh-ed25519-agent || fail "ssh-add -d ed25519 failed" | 209 | ${SSHADD} -qd $OBJ/ssh-ed25519-agent || fail "ssh-add -d ed25519 failed" |
210 | check_key_absent ssh-ed25519 | 210 | check_key_absent ssh-ed25519 |
211 | check_key_absent ssh-ed25519-cert-v01@openssh.com | 211 | check_key_absent ssh-ed25519-cert-v01@openssh.com |
212 | # Put key/cert back. | 212 | # Put key/cert back. |
@@ -214,11 +214,11 @@ ${SSHADD} $OBJ/ssh-ed25519-agent-private >/dev/null 2>&1 || \ | |||
214 | fail "ssh-add failed exit code $?" | 214 | fail "ssh-add failed exit code $?" |
215 | check_key_present ssh-ed25519 | 215 | check_key_present ssh-ed25519 |
216 | # Delete certificate via stdin | 216 | # Delete certificate via stdin |
217 | ${SSHADD} -qd - < ssh-ed25519-agent-cert.pub || fail "ssh-add -d - failed" | 217 | ${SSHADD} -qd - < $OBJ/ssh-ed25519-agent-cert.pub || fail "ssh-add -d - failed" |
218 | check_key_present ssh-ed25519 | 218 | check_key_present ssh-ed25519 |
219 | check_key_absent ssh-ed25519-cert-v01@openssh.com | 219 | check_key_absent ssh-ed25519-cert-v01@openssh.com |
220 | # Delete key via stdin | 220 | # Delete key via stdin |
221 | ${SSHADD} -qd - < ssh-ed25519-agent.pub || fail "ssh-add -d - failed" | 221 | ${SSHADD} -qd - < $OBJ/ssh-ed25519-agent.pub || fail "ssh-add -d - failed" |
222 | check_key_absent ssh-ed25519 | 222 | check_key_absent ssh-ed25519 |
223 | check_key_absent ssh-ed25519-cert-v01@openssh.com | 223 | check_key_absent ssh-ed25519-cert-v01@openssh.com |
224 | 224 | ||