Changeset 278381d in mod_gnutls for test/softhsm.bash

Timestamp:

Jan 9, 2020, 1:54:05 AM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

573b810

Parents:

482bafc

git-author:

Fiona Klute <fiona.klute@…> (01/08/20 17:48:04)

git-committer:

Fiona Klute <fiona.klute@…> (01/09/20 01:54:05)

Message:

Remove code for SoftHSM 1 support

SoftHSM 1 has been unsupported for years, so there's no point in
supporting tests with it.

File:

• test/softhsm.bash (modified) (2 diffs)

test/softhsm.bash

@@ -67 +67 @@
 softhsm="$(basename ${SOFTHSM})"
 
-if [ "${softhsm}" = "softhsm" ]; then
-    softhsm_libname="libsofthsm.so"
-    # fail if SOFTHSM_CONF is not set
-    if [ -z "${SOFTHSM_CONF}" ]; then
-        echo "ERROR: SOFTHSM_CONF not set!" 1>&2
-        exit 1
-    else
-        export SOFTHSM_CONF
-    fi
-    echo "using SOFTHSM_CONF=\"${SOFTHSM_CONF}\""
-elif [ "${softhsm}" = "softhsm2-util" ]; then
+if [ "${softhsm}" = "softhsm2-util" ]; then
     softhsm_libname="libsofthsm2.so"
     # fail if SOFTHSM2_CONF is not set
@@ -93 +83 @@
 
 if [ -z "${SOFTHSM_LIB}" ]; then
-    # Try to find the libsofthsm[2] module in some common locations.
+    # Try to find the libsofthsm2 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