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 /regress/agent-pkcs11.sh | |
| parent | 760ae37b4505453c6fa4faf1aa39a8671ab053af (diff) | |
| download | openssh-git-3c0c657ed7cd335fc05c0852d88232ca7e92a5d9.tar.gz | |
upstream: allow override of ssh-pkcs11-helper binary via
$TEST_SSH_SSHPKCS11HELPER from markus@
OpenBSD-Regress-ID: 7382a3d76746f5a792d106912a5819fd5e49e469
Diffstat (limited to 'regress/agent-pkcs11.sh')
| -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 34662871..ab429768 100644 --- a/regress/agent-pkcs11.sh +++ b/regress/agent-pkcs11.sh @@ -1,4 +1,4 @@ -# $OpenBSD: agent-pkcs11.sh,v 1.4 2019/01/20 23:25:25 djm Exp $ +# $OpenBSD: agent-pkcs11.sh,v 1.5 2019/01/20 23:26:44 djm Exp $ # Placed in the Public Domain. tid="pkcs11 agent test" @@ -6,6 +6,10 @@ tid="pkcs11 agent test" TEST_SSH_PIN=1234 TEST_SSH_SOPIN=12345678 TEST_SSH_PKCS11=/usr/local/lib/softhsm/libsofthsm2.so +if [ "x$TEST_SSH_SSHPKCS11HELPER" != "x" ]; then + SSH_PKCS11_HELPER="${TEST_SSH_SSHPKCS11HELPER}" + export SSH_PKCS11_HELPER +fi test -f "$TEST_SSH_PKCS11" || fatal "$TEST_SSH_PKCS11 does not exist" |