Changeset 278381d in mod_gnutls for test/softhsm.bash


Ignore:
Timestamp:
Jan 9, 2020, 1:54:05 AM (7 months ago)
Author:
Fiona Klute <fiona.klute@…>
Branches:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • 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
Note: See TracChangeset for help on using the changeset viewer.