Changeset aeaf28b in mod_gnutls

Timestamp:

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

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, 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.

Files:

• configure.ac (modified) (1 diff)
• test/Makefile.am (modified) (1 diff)
• test/softhsm.bash (modified) (1 diff)

configure.ac

@@ -199 +199 @@
 AM_SUBST_NOTMAKE(TEST_IP)
 
+dnl Allow user to set SoftHSM PKCS #11 module
+AC_ARG_VAR([SOFTHSM_LIB], [Absolute path of the SoftHSM PKCS @%:@11 module to \
+                          use. By default the test suite will search common \
+                          library paths.])
+
 dnl Build list of "Listen" statements for Apache
 LISTEN_LIST="# Listen addresses for the test servers"

test/Makefile.am

@@ -189 +189 @@
 if HAVE_SOFTHSM
 AM_TESTS_ENVIRONMENT += export SOFTHSM="@SOFTHSM@"; \
-        export SOFTHSM_MAJOR_VERSION="@SOFTHSM_MAJOR_VERSION@";
+        export SOFTHSM_MAJOR_VERSION="@SOFTHSM_MAJOR_VERSION@"; \
+        export SOFTHSM_LIB="@SOFTHSM_LIB@"
 endif
 

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