diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-01-20 23:26:44 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-01-21 11:51:54 +1100 |
commit | 3c0c657ed7cd335fc05c0852d88232ca7e92a5d9 (patch) | |
tree | 142eadb71258e8a0c4d4b03d2aa346f8a072da38 | |
parent | 760ae37b4505453c6fa4faf1aa39a8671ab053af (diff) |
upstream: allow override of ssh-pkcs11-helper binary via
$TEST_SSH_SSHPKCS11HELPER from markus@
OpenBSD-Regress-ID: 7382a3d76746f5a792d106912a5819fd5e49e469
-rw-r--r-- | regress/agent-pkcs11.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/regress/agent-pkcs11.sh b/regress/agent-pkcs11.sh index 34662871f..ab429768e 100644 --- a/regress/agent-pkcs11.sh +++ b/regress/agent-pkcs11.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: agent-pkcs11.sh,v 1.4 2019/01/20 23:25:25 djm Exp $ | 1 | # $OpenBSD: agent-pkcs11.sh,v 1.5 2019/01/20 23:26:44 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="pkcs11 agent test" | 4 | tid="pkcs11 agent test" |
@@ -6,6 +6,10 @@ tid="pkcs11 agent test" | |||
6 | TEST_SSH_PIN=1234 | 6 | TEST_SSH_PIN=1234 |
7 | TEST_SSH_SOPIN=12345678 | 7 | TEST_SSH_SOPIN=12345678 |
8 | TEST_SSH_PKCS11=/usr/local/lib/softhsm/libsofthsm2.so | 8 | TEST_SSH_PKCS11=/usr/local/lib/softhsm/libsofthsm2.so |
9 | if [ "x$TEST_SSH_SSHPKCS11HELPER" != "x" ]; then | ||
10 | SSH_PKCS11_HELPER="${TEST_SSH_SSHPKCS11HELPER}" | ||
11 | export SSH_PKCS11_HELPER | ||
12 | fi | ||
9 | 13 | ||
10 | test -f "$TEST_SSH_PKCS11" || fatal "$TEST_SSH_PKCS11 does not exist" | 14 | test -f "$TEST_SSH_PKCS11" || fatal "$TEST_SSH_PKCS11 does not exist" |
11 | 15 | ||