circleci: test softhsm

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2328a7a4087678cdd0649e3e08032e10da6ec4f9..6af960b74b254dadf10486432fe300ed93b30cb9 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -686,7 +686,7 @@ jobs:
     steps:
       - auth-regress-setup
       - run:
-          command: apt-get install -qq -y sqlite3
+          command: apt-get install -qq -y sqlite3 p11-kit softhsm2
       - auth-regress:
           context: bind-both
       - auth-regress:
@@ -697,6 +697,8 @@ jobs:
           context: bind-dnssec-nsec3-optout-both
       - auth-regress:
           context: bind-dnssec-nsec3-narrow
+      - auth-regress:
+          context: bind-dnssec-pkcs11
       - run:
           command: apt-get install -qq -y default-mysql-client
       - run:

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index 48e513e16c685796e06205f85b7f195859d289e7..49f2e697c66634da4eb22ac28d30ba8ec537bb4f 100755 (executable)
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -137,7 +137,7 @@ securezone ()
                        label=pdnstest-${EPOCHSECONDS}-${slot}
                        softhsm2-util --delete-token --label $label 2> /dev/null || true
                        softhsm2-util --init-token --label $label --free --pin 1234 --so-pin 1234
-                       kid=`$PDNSUTIL --config-dir=. $configname hsm assign $zone ecdsa256 ksk softhsm $label 1234 $label 2>&1 | grep softhsm | awk '{ print $NF }'`
+                       kid=`$PDNSUTIL --config-dir=. $configname hsm assign $zone ecdsa256 ksk softhsm2 $label 1234 $label 2>&1 | grep softhsm | awk '{ print $NF }'`
                        $PDNSUTIL --config-dir=. $configname hsm create-key $zone $kid
                else
                        $PDNSUTIL --config-dir=. $configname secure-zone $zone 2>&1