diff options
| author | Linus Nordberg <linus@sunet.se> | 2019-10-22 15:40:54 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@sunet.se> | 2019-10-22 15:40:54 +0200 |
| commit | 620dd393c9cea1168a18ba86fb86a0333bcfbae7 (patch) | |
| tree | 98b7376f0fd3cacd70295594bc25835c23d513c4 | |
| parent | 108efda9aab317b31bedf64fdf18ad9a8ac4b851 (diff) | |
export SOFTHSM2_CONF properly
Also, do create the token directory.
| -rw-r--r-- | tests/Makefile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/Makefile b/tests/Makefile index 3c451e8..405729b 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -6,6 +6,8 @@ TEXT = "A foo is a bar" SOFTHSM = /usr/bin/softhsm2-util +SOFTHSM_DIR = $(CURDIR)/softhsm +export SOFTHSM2_CONF = $(SOFTHSM_DIR)/softhsm2.conf SOFTHSM_PROVIDER = /usr/lib/x86_64-linux-gnu/softhsm/libsofthsm2.so P11P_PROVIDER = /usr/lib/x86_64-linux-gnu/pkcs11/p11-kit-client.so @@ -21,13 +23,10 @@ direct-softhsm: testsig.hsm.pem softhsm-token-setup: softhsm-token-setup.stamp softhsm-token-setup.stamp: softhsm/tokens testkey.pkcs8 test -x $(SOFTHSM) - ( \ - BASEDIR=$$(pwd); \ - export SOFTHSM2_CONF=$$BASEDIR/softhsm/softhsm2.conf; \ - echo "directories.tokendir = $$BASEDIR/softhsm/tokens/" > $$SOFTHSM2_CONF; \ - ${SOFTHSM} --init-token --free --label mytoken --so-pin ffffff --pin ffff; \ - ${SOFTHSM} --import testkey.pkcs8 --token mytoken --label mykey --id 00 --pin ffff; \ - ) + test -d $(SOFTHSM_DIR) || mkdir -p $(SOFTHSM_DIR) + echo "directories.tokendir = $$(pwd)/softhsm/tokens/" > $(SOFTHSM2_CONF) + ${SOFTHSM} --init-token --free --label mytoken --so-pin ffffff --pin ffff + ${SOFTHSM} --import testkey.pkcs8 --token mytoken --label mykey --id 00 --pin ffff touch $@ softhsm/tokens: |