Changeset b0e5dae in mod_gnutls
- Timestamp:
- Feb 12, 2016, 9:20:46 PM (7 years ago)
- Branches:
- asyncio, debian/master, debian/stretch-backports, jessie-backports, master, proxy-ticket, upstream
- Children:
- aeaf28b
- Parents:
- 6f644fa
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
configure.ac
r6f644fa rb0e5dae 172 172 MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_LIBS}" 173 173 174 AC_PATH_PROGS([SOFTHSM], [softhsm ], [no])174 AC_PATH_PROGS([SOFTHSM], [softhsm2-util softhsm], [no]) 175 175 if test "${SOFTHSM}" != "no"; then 176 176 softhsm_version=$(${SOFTHSM} --version) -
test/Makefile.am
r6f644fa rb0e5dae 113 113 endif 114 114 115 # SoftHSM files 116 check_DATA += server/softhsm.db 117 MOSTLYCLEANFILES += tests/24_pkcs11_cert/softhsm.conf server/softhsm.db 118 115 116 # SoftHSM tokens. Note that the SoftHSM 2 token is a directory and 117 # hence has to be treated slightly differently. 118 SOFTHSM_TOKEN = server/softhsm.db 119 SOFTHSM2_TOKEN = server/softhsm2.db 120 121 # Tokens should be cleaned whether or not the matching SoftHSM version 122 # was detected on the last ./configure run. 123 MOSTLYCLEANFILES += $(SOFTHSM_TOKEN) 124 # included in mostlyclean-local below 125 clean-softhsm2-db: 126 -rm -rf $(SOFTHSM2_TOKEN) 127 128 if HAVE_SOFTHSM1 129 check_DATA += $(SOFTHSM_TOKEN) 130 endif HAVE_SOFTHSM1 131 132 if HAVE_SOFTHSM2 133 check_DATA += $(SOFTHSM2_TOKEN) 134 endif HAVE_SOFTHSM2 119 135 120 136 check_DATA += make-test-dirs … … 122 138 make-test-dirs: 123 139 mkdir -p $(extra_dirs) 124 .PHONY: make-test-dirs 140 141 .PHONY: make-test-dirs clean-softhsm2-db 142 143 mostlyclean-local: clean-softhsm2-db 125 144 126 145 clean-local: -
test/test-24_pkcs11_cert.bash
r6f644fa rb0e5dae 3 3 testdir="$(dirname ${0})/tests/24_pkcs11_cert" 4 4 5 # The Apache/SoftHSM configuration mixes up directories, so generate a6 # config file with an absolute pathto the token database from a7 # template. Generating iton every run avoids problems if the source5 # The Apache/SoftHSM configuration mixes up directories, so generate 6 # config files with absolute paths to the token database from a 7 # template. Generating them on every run avoids problems if the source 8 8 # tree was moved. 9 9 tmp_softhsm_conf="$(mktemp mod_gnutls_test-XXXXXX.conf)" … … 14 14 trap cleanup_tmpconf EXIT 15 15 16 cat - >"${tmp_softhsm_conf}" <<EOF 16 if [ "${SOFTHSM_MAJOR_VERSION}" = "1" ]; then 17 cat - >"${tmp_softhsm_conf}" <<EOF 17 18 0:$(realpath $(pwd))/server/softhsm.db 18 19 EOF 19 export SOFTHSM_CONF="${tmp_softhsm_conf}" 20 export SOFTHSM_CONF="${tmp_softhsm_conf}" 21 elif [ "${SOFTHSM_MAJOR_VERSION}" = "2" ]; then 22 cat - >"${tmp_softhsm_conf}" <<EOF 23 objectstore.backend = file 24 directories.tokendir = $(realpath $(pwd))/server/softhsm2.db 25 EOF 26 export SOFTHSM2_CONF="${tmp_softhsm_conf}" 27 fi 28 20 29 echo "Generated temporary SoftHSM config ${tmp_softhsm_conf}:" 21 30 cat "${tmp_softhsm_conf}" -
test/test_ca.mk
r6f644fa rb0e5dae 64 64 $(srcdir)/softhsm.bash init $(dir $@)secret.key $(dir $@)x509.pem 65 65 66 %/softhsm2.conf: %/secret.key 67 echo "objectstore.backend = file" > $@ 68 echo "directories.tokendir = $(dir $@)softhsm2.db" >> $@ 69 70 %/softhsm2.db: %/x509.pem %/secret.key %/softhsm2.conf 71 mkdir -p $@ 72 SOFTHSM="@SOFTHSM@" \ 73 SOFTHSM2_CONF="$(dir $@)softhsm2.conf" \ 74 $(srcdir)/softhsm.bash init $(dir $@)secret.key $(dir $@)x509.pem 75 66 76 # Generate CRL revoking a certain certificate. Currently used to 67 77 # revoke the server certificate and check if setting the CRL as
Note: See TracChangeset
for help on using the changeset viewer.