testpkcs11: modified to support both softhsmv1 and v2

diff --git a/tests/suite/testpkcs11.softhsm b/tests/suite/testpkcs11.softhsm
index b1c783d44f6331290bce516f800133aa60d74115..20366612a10cd12c2a66eba5100c4c03cb897147 100755 (executable)
--- a/tests/suite/testpkcs11.softhsm
+++ b/tests/suite/testpkcs11.softhsm
@@ -18,8 +18,6 @@
 # along with GnuTLS; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-export SOFTHSM2_CONF="softhsm-testpkcs11.config"
-
 if test -f /usr/lib64/pkcs11/libsofthsm2.so;then
        ADDITIONAL_PARAM="--provider /usr/lib64/pkcs11/libsofthsm2.so"
 else
@@ -34,18 +32,34 @@ init_card () {
        PIN=$1
        PUK=$2
 
-       if ! test -x "/usr/bin/softhsm2-util";then
-               echo "Could not find /usr/bin/softhsm2-util"
+       if test -x "/usr/bin/softhsm2-util";then
+               export SOFTHSM2_CONF="softhsm-testpkcs11.config"
+               SOFTHSM_TOOL="/usr/bin/softhsm2-util"
+       fi
+
+       if test -x "/usr/bin/softhsm";then
+               export SOFTHSM_CONF="softhsm-testpkcs11.config"
+               SOFTHSM_TOOL="/usr/bin/softhsm"
+       fi
+
+       if test -z "$SOFTHSM_TOOL";then
+               echo "Could not find softhsm(2) tool"
                exit 77
        fi
 
-       rm -rf ./softhsm-testpkcs11.db
-       mkdir -p ./softhsm-testpkcs11.db
-       echo "objectstore.backend = file" > $SOFTHSM2_CONF
-       echo "directories.tokendir = ./softhsm-testpkcs11.db" >> $SOFTHSM2_CONF
+       if test -z "$SOFTHSM_CONF";then
+               rm -rf ./softhsm-testpkcs11.db
+               mkdir -p ./softhsm-testpkcs11.db
+               echo "objectstore.backend = file" > $SOFTHSM2_CONF
+               echo "directories.tokendir = ./softhsm-testpkcs11.db" >> $SOFTHSM2_CONF
+       else
+               rm -rf ./softhsm-testpkcs11.db
+               echo "0:./softhsm-testpkcs11.db" > $SOFTHSM_CONF
+       fi
+
 
        echo -n "* Initializing smart card... "
-       softhsm2-util --init-token --slot 0 --label "GnuTLS-Test" --so-pin $PUK --pin $PIN >/dev/null #2>&1
+       $SOFTHSM_TOOL --init-token --slot 0 --label "GnuTLS-Test" --so-pin $PUK --pin $PIN >/dev/null #2>&1
        if test $? = 0;then
                echo ok
        else