From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Tue, 9 Jun 2020 08:59:26 +0000 (+0200)
Subject: circleci: test softhsm
X-Git-Tag: dnsdist-1.5.0-rc3~5^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a60b31f5feffa12df0a76b76399efd7202c38706;p=thirdparty%2Fpdns.git

circleci: test softhsm
---

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2328a7a408..6af960b74b 100644
--- 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 48e513e16c..49f2e697c6 100755
--- 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