diff options
| author | Linus Nordberg <linus@sunet.se> | 2019-06-11 23:03:14 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@sunet.se> | 2019-06-11 23:03:14 +0200 |
| commit | fea7446cd21c4546da81bf4ed508bac310c53cdf (patch) | |
| tree | 9fcaa1cd951fe1424ed7cc23a008c63ebf1a96aa /src/tests/Makefile | |
| parent | b4c31dfdb873a4e7a639c281a5fff88134e0d1f5 (diff) | |
have server serve the whole module and not just the token
also, clean up by killing off server
Diffstat (limited to 'src/tests/Makefile')
| -rw-r--r-- | src/tests/Makefile | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/src/tests/Makefile b/src/tests/Makefile index a1003bf..94b8790 100644 --- a/src/tests/Makefile +++ b/src/tests/Makefile @@ -11,7 +11,12 @@ SOFTHSM_PROVIDER = /usr/lib/softhsm/libsofthsm2.so P11P_PROVIDER = /home/linus/usr/lib/pkcs11/p11-kit-client.so p11p-softhsm: testsig.hsm.p11p.pem - ./do-verify.sh ./openssl.p11p.cnf $(P11P_PROVIDER) $< "$(TEXT)" + ( \ + P11_ENV=$$(p11-kit server $(SOFTHSM_PROVIDER)); \ + eval "$$P11_ENV"; \ + ./do-verify.sh ./openssl.p11p.cnf $(P11P_PROVIDER) $< "$(TEXT)"; \ + p11-kit server --kill > /dev/null; \ + ) direct-softhsm: testsig.hsm.pem ./do-verify.sh ./openssl.direct.cnf $(SOFTHSM_PROVIDER) $< "$(TEXT)" @@ -43,18 +48,20 @@ testsig.local.pem: testkey.pem testsig.hsm.pem: softhsm-token-setup ./do-sign.sh ./openssl.direct.cnf $(SOFTHSM_PROVIDER) $@ "$(TEXT)" -testsig.hsm.p11p.pem: server-running - ./do-sign.sh ./openssl.p11p.cnf $(P11P_PROVIDER) $@ "$(TEXT)" +testsig.hsm.p11p.pem: softhsm-token-setup + ( \ + P11_ENV=$$(p11-kit server $(SOFTHSM_PROVIDER)); \ + eval "$$P11_ENV"; \ + ./do-sign.sh ./openssl.p11p.cnf $(P11P_PROVIDER) $@ "$(TEXT)"; \ + p11-kit server --kill > /dev/null; \ + ) server-running: - ( tokenurl=$$(p11tool --login --provider=$(SOFTHSM_PROVIDER) --list-token-urls); \ -# FIXME: use env printed to 'p11-kit server --kill', at some point -# eval p11-kit server --provider $(SOFTHSM_PROVIDER) $$tokenurl; \ - p11-kit server --provider $(SOFTHSM_PROVIDER) $$tokenurl; \ - ) +# FIXME: use env printed to do 'p11-kit server --kill', at some point clean: - [ -d softhsm ] && rm -r softhsm + -rm -r softhsm + -rm softhsm-token-setup.stamp -rm testkey.pem testkey.pkcs8 -rm testsig.*.pem |