Changeset 6f644fa in mod_gnutls for test

Timestamp:

Feb 12, 2016, 8:40:37 PM (5 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, proxy-ticket, upstream

Children:

b0e5dae

Parents:

74772b2

git-author:

Thomas Klute <thomas2.klute@…> (02/12/16 20:38:32)

git-committer:

Thomas Klute <thomas2.klute@…> (02/12/16 20:40:37)

Message:

Test suite: Generate SoftHSM config for initialization as needed

Location:

test

Files:

• Makefile.am (modified) (1 diff)
• server-softhsm.conf (deleted)
• test_ca.mk (modified) (1 diff)

test/Makefile.am

@@ -135 +135 @@
 
 EXTRA_DIST = $(apache_data) $(cert_templates) *.uid.in common.bash \
-        proxy_backend.bash runtests server-crl.template server-softhsm.conf \
-        softhsm.bash
+        proxy_backend.bash runtests server-crl.template softhsm.bash
 
 # Lockfile for the main Apache process

test/test_ca.mk

@@ -56 +56 @@
         certtool --generate-certificate --load-ca-certificate rogueca/x509.pem --load-ca-privkey rogueca/secret.key --load-request $(dir $@)cert-request --template $< > $@
 
-%/softhsm.db: %/x509.pem %/secret.key
+%/softhsm.conf: %/secret.key
+        echo "0:$(dir $@)softhsm.db" > $@
+
+%/softhsm.db: %/x509.pem %/secret.key %/softhsm.conf
         SOFTHSM="$(SOFTHSM)" \
-        SOFTHSM_CONF="$(srcdir)/$(*)-softhsm.conf" $(srcdir)/softhsm.bash init $(dir $@)secret.key $(dir $@)x509.pem
+        SOFTHSM_CONF="$(dir $@)softhsm.conf" \
+        $(srcdir)/softhsm.bash init $(dir $@)secret.key $(dir $@)x509.pem
 
 # Generate CRL revoking a certain certificate. Currently used to