Changeset aeaf28b in mod_gnutls for test/softhsm.bash

Timestamp:

Mar 10, 2016, 6:32:34 AM (7 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, main, master, proxy-ticket, upstream

Children:

5725dca

Parents:

b0e5dae

git-author:

Thomas Klute <thomas2.klute@…> (03/10/16 06:25:10)

git-committer:

Thomas Klute <thomas2.klute@…> (03/10/16 06:32:34)

Message:

Allow user to set SoftHSM PKCS #11 module

Users may want to use a SoftHSM module outside the usual system paths,
e.g. to try a development version without installing. If SOFTHSM_LIB
is set at ./configure time, it is assumed to contain the absolute path
of the library to use.

File:

• test/softhsm.bash (modified) (1 diff)

test/softhsm.bash

@@ -92 +92 @@
 fi
 
-# Try to find the libsofthsm[2] module in some common locations.
-softhsm_searchpath=(/usr/lib64/pkcs11 /usr/lib/softhsm /usr/lib/x86_64-linux-gnu/softhsm /usr/lib /usr/lib64/softhsm)
-for i in ${softhsm_searchpath[@]} ""; do
-    SOFTHSM_LIB="${i}/${softhsm_libname}"
-    echo "checking ${SOFTHSM_LIB} ..."
-    if [ -f "${SOFTHSM_LIB}" ]; then
-        echo "found!"
-        export SOFTHSM_LIB
-        break;
-    fi
-done
+if [ -z "${SOFTHSM_LIB}" ]; then
+    # Try to find the libsofthsm[2] module in some common locations.
+    softhsm_searchpath=(/usr/lib64/pkcs11 /usr/lib/softhsm /usr/lib/x86_64-linux-gnu/softhsm /usr/lib /usr/lib64/softhsm)
+    for i in ${softhsm_searchpath[@]} ""; do
+        SOFTHSM_LIB="${i}/${softhsm_libname}"
+        echo "checking ${SOFTHSM_LIB} ..."
+        if [ -f "${SOFTHSM_LIB}" ]; then
+            echo "found!"
+            export SOFTHSM_LIB
+            break;
+        fi
+    done
+else
+    echo "using ${SOFTHSM_LIB} (set by user)"
+fi
 
 if [ ! -f "${SOFTHSM_LIB}" ]; then