Changeset 278381d in mod_gnutls


Ignore:
Timestamp:
Jan 9, 2020, 1:54:05 AM (11 months 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.

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    r482bafc r278381d  
    224224MODULE_LIBS="${LIBGNUTLS_LIBS}"
    225225
    226 AC_PATH_PROGS([SOFTHSM], [softhsm2-util softhsm], [no])
    227 if test "${SOFTHSM}" != "no"; then
    228         softhsm_version=$(${SOFTHSM} --version)
    229         AS_VERSION_COMPARE([$(${SOFTHSM} --version)], [2.0.0],
    230                            [AC_SUBST(SOFTHSM_MAJOR_VERSION, [1])],
    231                            [AC_SUBST(SOFTHSM_MAJOR_VERSION, [2])],
    232                            [AC_SUBST(SOFTHSM_MAJOR_VERSION, [2])])
    233 fi
     226AC_PATH_PROGS([SOFTHSM], [softhsm2-util], [no])
    234227AM_CONDITIONAL([HAVE_SOFTHSM], [test "${SOFTHSM}" != "no"])
    235 AM_CONDITIONAL([HAVE_SOFTHSM1], [test "${SOFTHSM_MAJOR_VERSION}" = "1"])
    236 AM_CONDITIONAL([HAVE_SOFTHSM2], [test "${SOFTHSM_MAJOR_VERSION}" = "2"])
    237228
    238229AC_SUBST(MODULE_CFLAGS)
  • test/Makefile.am

    r482bafc r278381d  
    197197endif
    198198
    199 # SoftHSM tokens. Note that the SoftHSM 2 token is a directory and
    200 # hence has to be treated slightly differently.
    201 SOFTHSM_TOKEN = authority/server/softhsm.db
     199# SoftHSM token, note that the SoftHSM 2 token is a directory
    202200SOFTHSM2_TOKEN = authority/server/softhsm2.db
    203 
    204 # Tokens should be cleaned whether or not the matching SoftHSM version
    205 # was detected on the last ./configure run.
    206 MOSTLYCLEANFILES += $(SOFTHSM_TOKEN)
    207201# included in mostlyclean-local below
    208202clean-softhsm2-db:
    209203        -rm -rf $(SOFTHSM2_TOKEN)
    210204
    211 if HAVE_SOFTHSM1
    212 check_DATA += $(SOFTHSM_TOKEN)
    213 endif HAVE_SOFTHSM1
    214 
    215 if HAVE_SOFTHSM2
     205if HAVE_SOFTHSM
    216206check_DATA += $(SOFTHSM2_TOKEN)
    217 endif HAVE_SOFTHSM2
     207endif HAVE_SOFTHSM
    218208
    219209check_DATA += make-test-dirs
     
    304294if HAVE_SOFTHSM
    305295AM_TESTS_ENVIRONMENT += export SOFTHSM="@SOFTHSM@"; \
    306         export SOFTHSM_MAJOR_VERSION="@SOFTHSM_MAJOR_VERSION@"; \
    307296        export SOFTHSM_LIB="@SOFTHSM_LIB@";
    308297endif
  • test/softhsm.bash

    r482bafc r278381d  
    6767softhsm="$(basename ${SOFTHSM})"
    6868
    69 if [ "${softhsm}" = "softhsm" ]; then
    70     softhsm_libname="libsofthsm.so"
    71     # fail if SOFTHSM_CONF is not set
    72     if [ -z "${SOFTHSM_CONF}" ]; then
    73         echo "ERROR: SOFTHSM_CONF not set!" 1>&2
    74         exit 1
    75     else
    76         export SOFTHSM_CONF
    77     fi
    78     echo "using SOFTHSM_CONF=\"${SOFTHSM_CONF}\""
    79 elif [ "${softhsm}" = "softhsm2-util" ]; then
     69if [ "${softhsm}" = "softhsm2-util" ]; then
    8070    softhsm_libname="libsofthsm2.so"
    8171    # fail if SOFTHSM2_CONF is not set
     
    9383
    9484if [ -z "${SOFTHSM_LIB}" ]; then
    95     # Try to find the libsofthsm[2] module in some common locations.
     85    # Try to find the libsofthsm2 module in some common locations.
    9686    softhsm_searchpath=(/usr/lib64/pkcs11 /usr/lib/softhsm /usr/lib/x86_64-linux-gnu/softhsm /usr/lib /usr/lib64/softhsm)
    9787    for i in ${softhsm_searchpath[@]} ""; do
  • test/test-24_pkcs11_cert.bash

    r482bafc r278381d  
    1414trap cleanup_tmpconf EXIT
    1515
    16 if [ "${SOFTHSM_MAJOR_VERSION}" = "1" ]; then
    17     cat - >"${tmp_softhsm_conf}" <<EOF
    18 0:$(realpath $(pwd))/server/softhsm.db
    19 EOF
    20     export SOFTHSM_CONF="${tmp_softhsm_conf}"
    21 elif [ "${SOFTHSM_MAJOR_VERSION}" = "2" ]; then
    22     cat - >"${tmp_softhsm_conf}" <<EOF
     16cat - >"${tmp_softhsm_conf}" <<EOF
    2317objectstore.backend = file
    2418directories.tokendir = $(realpath $(pwd))/authority/server/softhsm2.db
    2519EOF
    26     export SOFTHSM2_CONF="${tmp_softhsm_conf}"
    27 fi
     20export SOFTHSM2_CONF="${tmp_softhsm_conf}"
    2821
    2922echo "Generated temporary SoftHSM config ${tmp_softhsm_conf}:"
  • test/test_ca.mk

    r482bafc r278381d  
    8585        $(cert_rule)
    8686
    87 %/softhsm.conf: %/secret.key
    88         echo "0:$(dir $@)softhsm.db" > $@
    89 
    90 %/softhsm.db: %/x509.pem %/secret.key %/softhsm.conf
    91         SOFTHSM="$(SOFTHSM)" \
    92         SOFTHSM_CONF="$(dir $@)softhsm.conf" \
    93         $(srcdir)/softhsm.bash init $(dir $@)secret.key $(dir $@)x509.pem
    94 
    9587%/softhsm2.conf: %/secret.key
    9688        echo "objectstore.backend = file" > $@
Note: See TracChangeset for help on using the changeset viewer.