Changeset 3f00958 in mod_gnutls

Timestamp:

May 8, 2015, 8:53:36 PM (8 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

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

Children:

d92899e

Parents:

1708045

git-author:

Thomas Klute <thomas2.klute@…> (05/08/15 19:12:37)

git-committer:

Thomas Klute <thomas2.klute@…> (05/08/15 20:53:36)

Message:

New test case: PKCS #11 URLs for server key and certificate

The new test case checks if the server can access its key and
certificate using PKCS #11 URLs. SoftHSM (v1 only for now) is used to
provide the PKCS #11 token. If SoftHSM is not available, the test case
is skipped.

Location:

test

Files:

• .gitignore (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• TestMakefile (modified) (1 diff)
• server-softhsm.conf (added)
• softhsm.bash (added)
• test-24_pkcs11_cert.bash (added)
• tests/24_pkcs11_cert/apache.conf (added)
• tests/24_pkcs11_cert/gnutls-cli.args (added)
• tests/24_pkcs11_cert/input (added)
• tests/24_pkcs11_cert/output (added)
• tests/24_pkcs11_cert/softhsm.conf.in (added)

test/.gitignore

@@ -18 +18 @@
 *.trs
 *.lock
+tests/24_pkcs11_cert/softhsm.conf

test/Makefile.am

@@ -24 +24 @@
         test-21_TLS_reverse_proxy_wrong_cert.bash \
         test-22_TLS_reverse_proxy_crl_revoke.bash \
-        test-23_TLS_reverse_proxy_mismatched_priorities.bash
+        test-23_TLS_reverse_proxy_mismatched_priorities.bash \
+        test-24_pkcs11_cert.bash
 
 TESTS = $(check_SCRIPTS)
@@ -49 +50 @@
 clean-local:
         $(MAKE) -f TestMakefile $(AM_MAKEFLAGS) clean
+
+check_DATA += server/softhsm.db
+MOSTLYCLEANFILES += tests/24_pkcs11_cert/softhsm.conf
+
+# The dependency on setup.done is necessary to avoid race conditions
+# between multiple calls to TestMakefile for key and certificate
+# generation.
+server/softhsm.db: setup.done
+        $(MAKE) -f TestMakefile $(AM_MAKEFLAGS) server/softhsm.db

test/TestMakefile

@@ -74 +74 @@
         certtool --generate-certificate --load-ca-certificate authority/x509.pem --load-ca-privkey authority/secret.key --load-request $(dir $@)cert-request --template $< > $@
 
+%/softhsm.db: %/x509.pem %/secret.key
+        SOFTHSM_CONF="$(*)-softhsm.conf" ./softhsm.bash init $(dir $@)secret.key $(dir $@)x509.pem
+
 msva.gnupghome/trustdb.gpg: authority/minimal.pgp client/cert.pgp
         mkdir -p -m 0700 $(dir $@)