SoftHSM 2.4.0 only supports softhsm2.conf now, rewrite GitLab CI commands to properly...

diff --git a/util/copyrights b/util/copyrights
index 61ea7577f408151fdf688f38f2f9c7ef7ca56642..5fe1cca045f6285c89af76dbd806a340fefd4c87 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -4436,6 +4436,7 @@
 ./util/nanny.pl                                        PERL    2000,2001,2004,2007,2012,2016,2018
 ./util/new-func                                        PERL    2005,2007,2012,2016,2018
 ./util/nt-kit                                  SH      1999,2000,2001,2004,2007,2012,2016,2018
+./util/prepare-softhsm2.sh                     X       2018
 ./util/spacewhack.pl                           PERL    2000,2001,2004,2007,2012,2016,2018
 ./util/tabify-changes                          SH      2004,2007,2012,2016,2018
 ./util/update-drafts.pl                                PERL    2000,2001,2004,2007,2012,2016,2018

diff --git a/util/prepare-softhsm2.sh b/util/prepare-softhsm2.sh
new file mode 100644 (file)
index 0000000..24c7f17
--- /dev/null
+++ b/util/prepare-softhsm2.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+if [ -n "${SOFTHSM2_CONF}" ] && command -v softhsm2-util >/dev/null; then
+    SOFTHSM2_DIR=$(dirname "$SOFTHSM2_CONF")
+    mkdir -p "${SOFTHSM2_DIR}/tokens"
+    echo "directories.tokendir = ${SOFTHSM2_DIR}/tokens" > "${SOFTHSM2_CONF}"
+    echo "objectstore.backend = file" >> "${SOFTHSM2_CONF}"
+    echo "log.level = DEBUG" >> "${SOFTHSM2_CONF}"
+    softhsm2-util --init-token --free --pin 0000 --so-pin 0000 --label "softhsm2";
+fi
+exit 0