]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: allow override of ssh-pkcs11-helper binary via
authordjm@openbsd.org <djm@openbsd.org>
Sun, 20 Jan 2019 23:26:44 +0000 (23:26 +0000)
committerDamien Miller <djm@mindrot.org>
Mon, 21 Jan 2019 00:51:54 +0000 (11:51 +1100)
$TEST_SSH_SSHPKCS11HELPER from markus@

OpenBSD-Regress-ID: 7382a3d76746f5a792d106912a5819fd5e49e469

regress/agent-pkcs11.sh

index 34662871fa98f356bcf0ec877a06c8a96f3b29f1..ab429768eaa1c41a0d30442c54cf36bc3dc1c37e 100644 (file)
@@ -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"