Changeset 278381d in mod_gnutls

Timestamp:

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

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, main, 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.

Files:

• configure.ac (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/softhsm.bash (modified) (2 diffs)
• test/test-24_pkcs11_cert.bash (modified) (1 diff)
• test/test_ca.mk (modified) (1 diff)

configure.ac

@@ -224 +224 @@
 MODULE_LIBS="${LIBGNUTLS_LIBS}"
 
-AC_PATH_PROGS([SOFTHSM], [softhsm2-util softhsm], [no])
-if test "${SOFTHSM}" != "no"; then
-        softhsm_version=$(${SOFTHSM} --version)
-        AS_VERSION_COMPARE([$(${SOFTHSM} --version)], [2.0.0],
-                           [AC_SUBST(SOFTHSM_MAJOR_VERSION, [1])],
-                           [AC_SUBST(SOFTHSM_MAJOR_VERSION, [2])],
-                           [AC_SUBST(SOFTHSM_MAJOR_VERSION, [2])])
-fi
+AC_PATH_PROGS([SOFTHSM], [softhsm2-util], [no])
 AM_CONDITIONAL([HAVE_SOFTHSM], [test "${SOFTHSM}" != "no"])
-AM_CONDITIONAL([HAVE_SOFTHSM1], [test "${SOFTHSM_MAJOR_VERSION}" = "1"])
-AM_CONDITIONAL([HAVE_SOFTHSM2], [test "${SOFTHSM_MAJOR_VERSION}" = "2"])
 
 AC_SUBST(MODULE_CFLAGS)

test/Makefile.am

@@ -197 +197 @@
 endif
 
-# SoftHSM tokens. Note that the SoftHSM 2 token is a directory and
-# hence has to be treated slightly differently.
-SOFTHSM_TOKEN = authority/server/softhsm.db
+# SoftHSM token, note that the SoftHSM 2 token is a directory
 SOFTHSM2_TOKEN = authority/server/softhsm2.db
-
-# Tokens should be cleaned whether or not the matching SoftHSM version
-# was detected on the last ./configure run.
-MOSTLYCLEANFILES += $(SOFTHSM_TOKEN)
 # included in mostlyclean-local below
 clean-softhsm2-db:
         -rm -rf $(SOFTHSM2_TOKEN)
 
-if HAVE_SOFTHSM1
-check_DATA += $(SOFTHSM_TOKEN)
-endif HAVE_SOFTHSM1
-
-if HAVE_SOFTHSM2
+if HAVE_SOFTHSM
 check_DATA += $(SOFTHSM2_TOKEN)
-endif HAVE_SOFTHSM2
+endif HAVE_SOFTHSM
 
 check_DATA += make-test-dirs
@@ -304 +294 @@
 if HAVE_SOFTHSM
 AM_TESTS_ENVIRONMENT += export SOFTHSM="@SOFTHSM@"; \
-        export SOFTHSM_MAJOR_VERSION="@SOFTHSM_MAJOR_VERSION@"; \
         export SOFTHSM_LIB="@SOFTHSM_LIB@";
 endif

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

test/test-24_pkcs11_cert.bash

@@ -14 +14 @@
 trap cleanup_tmpconf EXIT
 
-if [ "${SOFTHSM_MAJOR_VERSION}" = "1" ]; then
-    cat - >"${tmp_softhsm_conf}" <<EOF
-0:$(realpath $(pwd))/server/softhsm.db
-EOF
-    export SOFTHSM_CONF="${tmp_softhsm_conf}"
-elif [ "${SOFTHSM_MAJOR_VERSION}" = "2" ]; then
-    cat - >"${tmp_softhsm_conf}" <<EOF
+cat - >"${tmp_softhsm_conf}" <<EOF
 objectstore.backend = file
 directories.tokendir = $(realpath $(pwd))/authority/server/softhsm2.db
 EOF
-    export SOFTHSM2_CONF="${tmp_softhsm_conf}"
-fi
+export SOFTHSM2_CONF="${tmp_softhsm_conf}"
 
 echo "Generated temporary SoftHSM config ${tmp_softhsm_conf}:"

test/test_ca.mk

@@ -85 +85 @@
         $(cert_rule)
 
-%/softhsm.conf: %/secret.key
-        echo "0:$(dir $@)softhsm.db" > $@
-
-%/softhsm.db: %/x509.pem %/secret.key %/softhsm.conf
-        SOFTHSM="$(SOFTHSM)" \
-        SOFTHSM_CONF="$(dir $@)softhsm.conf" \
-        $(srcdir)/softhsm.bash init $(dir $@)secret.key $(dir $@)x509.pem
-
 %/softhsm2.conf: %/secret.key
         echo "objectstore.backend = file" > $@