From ba58a529f45b3dae2db68607d8c54ae96e90e705 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Mon, 21 Jan 2019 12:31:29 +1100
Subject: make agent-pkcs11 search harder for softhsm2.so

---
 regress/agent-pkcs11.sh | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/regress/agent-pkcs11.sh b/regress/agent-pkcs11.sh
index ab429768e..a57dad6ee 100644
--- a/regress/agent-pkcs11.sh
+++ b/regress/agent-pkcs11.sh
@@ -3,9 +3,24 @@
 
 tid="pkcs11 agent test"
 
+try_token_libs() {
+	for _lib in "$@" ; do
+		if test -f "$_lib" ; then
+			verbose "Using token library $_lib"
+			TEST_SSH_PKCS11="$_lib"
+			return
+		fi
+	done
+	echo "skipped: Unable to find PKCS#11 token library"
+	exit 0
+}
+
+try_token_libs \
+	/usr/local/lib/softhsm/libsofthsm2.so \
+	/usr/lib/x86_64-linux-gnu/softhsm/libsofthsm2.so
+
 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
-- 
cgit v1.2.3