diff options
| author |   djm <djm@openbsd.org> | 2019-01-20 23:26:44 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2019-01-20 23:26:44 +0000 |
| commit | 491e61de36244b1760994098886647adfa7f9c66 (patch) | |
| tree | ca90d8f3a8421a99b26a1bf0ccad80fb327854dd | |
| parent | adapt agent-pkcs11.sh test to softhsm2 and add support for ECDSA keys (diff) | |
| download | wireguard-openbsd-491e61de36244b1760994098886647adfa7f9c66.tar.xz wireguard-openbsd-491e61de36244b1760994098886647adfa7f9c66.zip | |
allow override of ssh-pkcs11-helper binary via $TEST_SSH_SSHPKCS11HELPER
from markus@
| -rw-r--r-- | regress/usr.bin/ssh/agent-pkcs11.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/regress/usr.bin/ssh/agent-pkcs11.sh b/regress/usr.bin/ssh/agent-pkcs11.sh index 34662871fa9..ab429768eaa 100644 --- a/regress/usr.bin/ssh/agent-pkcs11.sh +++ b/regress/usr.bin/ssh/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" |