Changeset b0e5dae in mod_gnutls for test/test-24_pkcs11_cert.bash

Timestamp:

Feb 12, 2016, 9:20:46 PM (4 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

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

Children:

aeaf28b

Parents:

6f644fa

Message:

Test suite: Add support for SoftHSM 2

./configure now detects SoftHSM version 1 or 2, and test case
"24_pkcs11_cert" can use either to provide its PKCS #11 token.

File:

• test/test-24_pkcs11_cert.bash (modified) (2 diffs)

test/test-24_pkcs11_cert.bash

@@ -3 +3 @@
 testdir="$(dirname ${0})/tests/24_pkcs11_cert"
 
-# The Apache/SoftHSM configuration mixes up directories, so generate a
-# config file with an absolute path to the token database from a
-# template. Generating it on every run avoids problems if the source
+# The Apache/SoftHSM configuration mixes up directories, so generate
+# config files with absolute paths to the token database from a
+# template. Generating them on every run avoids problems if the source
 # tree was moved.
 tmp_softhsm_conf="$(mktemp mod_gnutls_test-XXXXXX.conf)"
@@ -14 +14 @@
 trap cleanup_tmpconf EXIT
 
-cat - >"${tmp_softhsm_conf}" <<EOF
+if [ "${SOFTHSM_MAJOR_VERSION}" = "1" ]; then
+    cat - >"${tmp_softhsm_conf}" <<EOF
 0:$(realpath $(pwd))/server/softhsm.db
 EOF
-export SOFTHSM_CONF="${tmp_softhsm_conf}"
+    export SOFTHSM_CONF="${tmp_softhsm_conf}"
+elif [ "${SOFTHSM_MAJOR_VERSION}" = "2" ]; then
+    cat - >"${tmp_softhsm_conf}" <<EOF
+objectstore.backend = file
+directories.tokendir = $(realpath $(pwd))/server/softhsm2.db
+EOF
+    export SOFTHSM2_CONF="${tmp_softhsm_conf}"
+fi
+
 echo "Generated temporary SoftHSM config ${tmp_softhsm_conf}:"
 cat "${tmp_softhsm_conf}"