From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Tue, 22 Dec 2015 13:49:12 +0000 (+0100)
Subject: switch pkcs11 testing to ZSK-only
X-Git-Tag: dnsdist-1.0.0-alpha1~22^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f359cc986253afb6e3030d9c2a9c07757a1927f;p=thirdparty%2Fpdns.git

switch pkcs11 testing to ZSK-only
---

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index e140bc9312..92f1b97b41 100755
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -86,12 +86,6 @@ securezone ()
                   else
                     slot=$((slot+1))
                   fi
-                  sudo softhsm --init-token --slot $slot --label label$slot --pin 123$slot --so-pin 123$slot 
-                  kid=`$PDNSUTIL --config-dir=. $configname hsm assign $zone rsasha256 ksk softhsm label$slot 123$slot label$slot 2>&1 | grep softhsm | awk '{ print $NF }'`
-# keep this until #1413 is merged
-                  kid=`$PDNSUTIL --config-dir=. $configname show-zone $zone | grep 'ID =.*KSK' | awk '{ print $3 }'`
-                  $PDNSUTIL --config-dir=. $configname hsm create-key $zone $kid
-                  slot=$((slot+1))
                   sudo softhsm --init-token --slot $slot --label label$slot --pin 123$slot --so-pin 123$slot
                   kid=`$PDNSUTIL --config-dir=. $configname hsm assign $zone rsasha256 zsk softhsm label$slot 123$slot label$slot 2>&1 | grep softhsm | awk '{ print $NF }'`
                   kid=`$PDNSUTIL --config-dir=. $configname show-zone $zone | grep 'ID =.*ZSK' | awk '{ print $3 }'`