Changeset db6bac4 in mod_gnutls

Timestamp:

Feb 2, 2016, 5:11:14 PM (4 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

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

Children:

06f8005

Parents:

5d9f34e

Message:

PKCS #11 test case: Generate temporary SoftHSM config from here-document

Makes the test easier to understand, it needs one less static file,
and it will be easier to add SoftHSM 2 support this way.

Location:

test

Files:

• test-24_pkcs11_cert.bash (modified) (1 diff)
• tests/24_pkcs11_cert/softhsm.conf.in (deleted)
• tests/Makefile.am (modified) (1 diff)

test/test-24_pkcs11_cert.bash

@@ -14 +14 @@
 trap cleanup_tmpconf EXIT
 
-sed "s,__DIR__,$(realpath $(pwd))," \
-    "${testdir}/softhsm.conf.in" \
-    >"${tmp_softhsm_conf}"
+cat - >"${tmp_softhsm_conf}" <<EOF
+0:$(realpath $(pwd))/server/softhsm.db
+EOF
 export SOFTHSM_CONF="${tmp_softhsm_conf}"
 echo "Generated temporary SoftHSM config ${tmp_softhsm_conf}:"

test/tests/Makefile.am

@@ -24 +24 @@
         22_TLS_reverse_proxy_crl_revoke/apache.conf 22_TLS_reverse_proxy_crl_revoke/backend.conf 22_TLS_reverse_proxy_crl_revoke/gnutls-cli.args 22_TLS_reverse_proxy_crl_revoke/input 22_TLS_reverse_proxy_crl_revoke/output \
         23_TLS_reverse_proxy_mismatched_priorities/apache.conf 23_TLS_reverse_proxy_mismatched_priorities/backend.conf 23_TLS_reverse_proxy_mismatched_priorities/gnutls-cli.args 23_TLS_reverse_proxy_mismatched_priorities/input 23_TLS_reverse_proxy_mismatched_priorities/output \
-        24_pkcs11_cert/apache.conf 24_pkcs11_cert/gnutls-cli.args 24_pkcs11_cert/input 24_pkcs11_cert/output 24_pkcs11_cert/softhsm.conf.in
+        24_pkcs11_cert/apache.conf 24_pkcs11_cert/gnutls-cli.args 24_pkcs11_cert/input 24_pkcs11_cert/output