Changeset ff039b1 in mod_gnutls for test/test_ca.mk

Timestamp:

Jan 9, 2020, 3:03:14 PM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

478767a

Parents:

60ed7d1

Message:

Test suite: Replace softhsm.bash with Python code

With this all test scripts only call runtest.py.

File:

• test/test_ca.mk (modified) (1 diff)

test/test_ca.mk

@@ -85 +85 @@
         $(cert_rule)
 
-%/softhsm2.conf: %/secret.key
-        echo "objectstore.backend = file" > $@
-        echo "directories.tokendir = $(dir $@)softhsm2.db" >> $@
-
-%/softhsm2.db: %/x509.pem %/secret.key %/softhsm2.conf
-        rm -rf $@
-        mkdir -p $@
+%/softhsm2.db: %/x509.pem %/secret.key
         SOFTHSM="$(SOFTHSM)" \
-        SOFTHSM2_CONF="$(dir $@)softhsm2.conf" \
-        $(srcdir)/softhsm.bash init $(dir $@)secret.key $(dir $@)x509.pem
+        $(PYTHON) $(srcdir)/softhsm-init.py --token-dir $@ --privkey $(dir $@)secret.key --certificate $(dir $@)x509.pem
 
 # Generate CRL revoking a certain certificate. Currently used to