diff options
| author | Linus Nordberg <linus@sunet.se> | 2020-01-03 05:59:32 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@sunet.se> | 2020-01-03 05:59:32 +0100 |
| commit | 80b284ec6d48d1a5c71168dded6cfbc6b1958caa (patch) | |
| tree | 52f1f8fbaeaf71eede6a9be15607b9bb95ed8b5c | |
| parent | e2e05057ca1349873280115e8df6e2a1ba024ac3 (diff) | |
invoke do-verify.sh with the right arguments
Specifically, don't use $< now that we have the openssl config file as
our first dependant.
| -rw-r--r-- | tests/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/Makefile b/tests/Makefile index 2432680..2d44839 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -14,8 +14,11 @@ export SOFTHSM2_CONF = $(SOFTHSM_DIR)/softhsm2.conf all: direct-softhsm p11p-softhsm +direct-softhsm: openssl.direct.cnf testsig.hsm + echo "$(TEXT)" | ./do-verify.sh testsig.hsm $(SOFTHSM_PROVIDER) ./openssl.direct.cnf + p11p-softhsm: openssl.p11p.cnf testsig.hsm.p11p - echo "$(TEXT)" | ./do-verify.sh $< $(P11P_PROVIDER) ./openssl.p11p.cnf $(SOFTHSM_PROVIDER) + echo "$(TEXT)" | ./do-verify.sh testsig.hsm.p11p $(P11P_PROVIDER) ./openssl.p11p.cnf $(SOFTHSM_PROVIDER) softhsm-token-setup: softhsm-token-setup.stamp softhsm-token-setup.stamp: softhsm/tokens testkey.pkcs8 @@ -43,9 +46,6 @@ testsig.hsm: softhsm-token-setup testsig.hsm.p11p: openssl.p11p.cnf softhsm-token-setup echo "$(TEXT)" | ./do-sign.sh $@ $(P11P_PROVIDER) ./openssl.p11p.cnf $(SOFTHSM_PROVIDER) -direct-softhsm: testsig.hsm openssl.direct.cnf - echo "$(TEXT)" | ./do-verify.sh $< $(SOFTHSM_PROVIDER) ./openssl.direct.cnf - openssl.direct.cnf: openssl.template.cnf sed -e "s!@@P11P_PROVIDER@@!$(SOFTHSM_PROVIDER)!1" <$^ >$@ |