keymgr: use DEFAULT_ALGORITHM instead of {nsec3}rsasha1

diff --git a/bin/tests/system/keymgr/18-nonstd-prepub/policy.conf b/bin/tests/system/keymgr/18-nonstd-prepub/policy.conf.in
similarity index 94%
rename from bin/tests/system/keymgr/18-nonstd-prepub/policy.conf
rename to bin/tests/system/keymgr/18-nonstd-prepub/policy.conf.in
index d715e574943c81f0a27a6bf29d2256d02f6af7c8..757311af85dfaa703a14e98e6266f242bb3ad342 100644 (file)
--- a/bin/tests/system/keymgr/18-nonstd-prepub/policy.conf
+++ b/bin/tests/system/keymgr/18-nonstd-prepub/policy.conf.in
@@ -13,7 +13,7 @@
 
 policy default {
        policy global;
-       algorithm nsec3rsasha1;
+       algorithm @DEFAULT_ALGORITHM@;
        pre-publish zsk 2w;
        roll-period zsk 6mo;
        coverage 364d;

diff --git a/bin/tests/system/keymgr/19-old-keys/policy.conf b/bin/tests/system/keymgr/19-old-keys/policy.conf.in
similarity index 94%
rename from bin/tests/system/keymgr/19-old-keys/policy.conf
rename to bin/tests/system/keymgr/19-old-keys/policy.conf.in
index d715e574943c81f0a27a6bf29d2256d02f6af7c8..757311af85dfaa703a14e98e6266f242bb3ad342 100644 (file)
--- a/bin/tests/system/keymgr/19-old-keys/policy.conf
+++ b/bin/tests/system/keymgr/19-old-keys/policy.conf.in
@@ -13,7 +13,7 @@
 
 policy default {
        policy global;
-       algorithm nsec3rsasha1;
+       algorithm @DEFAULT_ALGORITHM@;
        pre-publish zsk 2w;
        roll-period zsk 6mo;
        coverage 364d;

diff --git a/bin/tests/system/keymgr/clean.sh b/bin/tests/system/keymgr/clean.sh
index c63919c9fa8b2cfd46ee161ffe286176a669b73d..d8cad32408935a1bd98008e03903f23aba0264a3 100644 (file)
--- a/bin/tests/system/keymgr/clean.sh
+++ b/bin/tests/system/keymgr/clean.sh
@@ -11,8 +11,11 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+rm -f 18-nonstd-prepub/policy.conf
+rm -f 19-old-keys/policy.conf
 rm -f K*.key */K*.key
 rm -f K*.private */K*.private
 rm -f coverage.* keymgr.* settime.*
 rm -f ns*/managed-keys.bind*
+rm -f policy.conf
 rm -f policy.out

diff --git a/bin/tests/system/keymgr/policy.conf b/bin/tests/system/keymgr/policy.conf.in
similarity index 94%
rename from bin/tests/system/keymgr/policy.conf
rename to bin/tests/system/keymgr/policy.conf.in
index 207ad02001cb3efb23b792e42075a8f3c28a7320..d6bc92533c458d13bd2d4bb7017d9d9781c5d1c7 100644 (file)
--- a/bin/tests/system/keymgr/policy.conf
+++ b/bin/tests/system/keymgr/policy.conf.in
@@ -13,7 +13,7 @@
 
 policy default {
        policy global;
-       algorithm nsec3rsasha1;
+       algorithm @DEFAULT_ALGORITHM@;
        key-size zsk 1024;
        pre-publish zsk 6w;
        post-publish zsk 6w;

diff --git a/bin/tests/system/keymgr/setup.sh b/bin/tests/system/keymgr/setup.sh
index 32d16e0bde179b45947f6aa32962d25726c4d2bb..d7cef0c0331ea3f2468777b9617f1d27bd7ed69f 100644 (file)
--- a/bin/tests/system/keymgr/setup.sh
+++ b/bin/tests/system/keymgr/setup.sh
@@ -19,117 +19,117 @@ KEYGEN="$KEYGEN -q"
 # Test 1: KSK goes inactive before successor is active
 dir=01-ksk-inactive
 echo_i "set up $dir"
-ksk1=`$KEYGEN -K $dir -a rsasha1 -3fk example.com`
+ksk1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -3fk example.com`
 $SETTIME -K $dir -I +9mo -D +1y $ksk1 > /dev/null 2>&1
 ksk2=`$KEYGEN -K $dir -S $ksk1`
 $SETTIME -K $dir -I +7mo $ksk1 > /dev/null 2>&1
-zsk1=`$KEYGEN -K $dir -a rsasha1 -3 example.com`
+zsk1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -3 example.com`
 
 # Test 2: ZSK goes inactive before successor is active
 dir=02-zsk-inactive
 echo_i "set up $dir"
-zsk1=`$KEYGEN -K $dir -a rsasha1 -3 example.com`
+zsk1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -3 example.com`
 $SETTIME -K $dir -I +9mo -D +1y $zsk1 > /dev/null 2>&1
 zsk2=`$KEYGEN -K $dir -S $zsk1`
 $SETTIME -K $dir -I +7mo $zsk1 > /dev/null 2>&1
-ksk1=`$KEYGEN -K $dir -a rsasha1 -3fk example.com`
+ksk1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -3fk example.com`
 
 # Test 3: KSK is unpublished before its successor is published
 dir=03-ksk-unpublished
 echo_i "set up $dir"
-ksk1=`$KEYGEN -K $dir -a rsasha1 -3fk example.com`
+ksk1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -3fk example.com`
 $SETTIME -K $dir -I +9mo -D +1y $ksk1 > /dev/null 2>&1
 ksk2=`$KEYGEN -K $dir -S $ksk1`
 $SETTIME -K $dir -D +6mo $ksk1 > /dev/null 2>&1
-zsk1=`$KEYGEN -K $dir -a rsasha1 -3 example.com`
+zsk1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -3 example.com`
 
 # Test 4: ZSK is unpublished before its successor is published
 dir=04-zsk-unpublished
 echo_i "set up $dir"
-zsk1=`$KEYGEN -K $dir -a rsasha1 -3 example.com`
+zsk1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -3 example.com`
 $SETTIME -K $dir -I +9mo -D +1y $zsk1 > /dev/null 2>&1
 zsk2=`$KEYGEN -K $dir -S $zsk1`
 $SETTIME -K $dir -D +6mo $zsk1 > /dev/null 2>&1
-ksk1=`$KEYGEN -K $dir -a rsasha1 -3fk example.com`
+ksk1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -3fk example.com`
 
 # Test 5: KSK deleted and successor published before KSK is deactivated
 # and successor activated.
 dir=05-ksk-unpub-active
 echo_i "set up $dir"
-ksk1=`$KEYGEN -K $dir -a rsasha1 -3fk example.com`
+ksk1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -3fk example.com`
 $SETTIME -K $dir -I +9mo -D +8mo $ksk1 > /dev/null 2>&1
 ksk2=`$KEYGEN -K $dir -S $ksk1`
-zsk1=`$KEYGEN -K $dir -a rsasha1 -3 example.com`
+zsk1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -3 example.com`
 
 # Test 6: ZSK deleted and successor published before ZSK is deactivated
 # and successor activated.
 dir=06-zsk-unpub-active
 echo_i "set up $dir"
-zsk1=`$KEYGEN -K $dir -a rsasha1 -3 example.com`
+zsk1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -3 example.com`
 $SETTIME -K $dir -I +9mo -D +8mo $zsk1 > /dev/null 2>&1
 zsk2=`$KEYGEN -K $dir -S $zsk1`
-ksk1=`$KEYGEN -K $dir -a rsasha1 -3fk example.com`
+ksk1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -3fk example.com`
 
 # Test 7: KSK rolled with insufficient delay after prepublication.
 dir=07-ksk-ttl
 echo_i "set up $dir"
-ksk1=`$KEYGEN -K $dir -a rsasha1 -3fk example.com`
+ksk1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -3fk example.com`
 $SETTIME -K $dir -I +9mo -D +1y $ksk1 > /dev/null 2>&1
 ksk2=`$KEYGEN -K $dir -S $ksk1`
 $SETTIME -K $dir -P +269d $ksk2 > /dev/null 2>&1
-zsk1=`$KEYGEN -K $dir -a rsasha1 -3 example.com`
+zsk1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -3 example.com`
 
 # Test 8: ZSK rolled with insufficient delay after prepublication.
 dir=08-zsk-ttl
 echo_i "set up $dir"
-zsk1=`$KEYGEN -K $dir -a rsasha1 -3 example.com`
+zsk1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -3 example.com`
 $SETTIME -K $dir -I +9mo -D +1y $zsk1 > /dev/null 2>&1
 zsk2=`$KEYGEN -K $dir -S $zsk1`
 # allow only 1 day between publication and activation
 $SETTIME -K $dir -P +269d $zsk2 > /dev/null 2>&1
-ksk1=`$KEYGEN -K $dir -a rsasha1 -3fk example.com`
+ksk1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -3fk example.com`
 
 # Test 9: No special preparation needed
 
 # Test 10: Valid key set, but rollover period has changed
 dir=10-change-roll
 echo_i "set up $dir"
-ksk1=`$KEYGEN -K $dir -a rsasha1 -3fk example.com`
-zsk1=`$KEYGEN -K $dir -a rsasha1 -3 example.com`
+ksk1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -3fk example.com`
+zsk1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -3 example.com`
 $SETTIME -K $dir -I +3mo -D +4mo $zsk1 > /dev/null 2>&1
 zsk2=`$KEYGEN -K $dir -S $zsk1`
 
 # Test 11: Many keys all simultaneously scheduled to be active in the future
 dir=11-many-simul
 echo_i "set up $dir"
-k1=`$KEYGEN -K $dir -a rsasha1 -q3fk -P now+1mo -A now+1mo example.com`
-z1=`$KEYGEN -K $dir -a rsasha1 -q3 -P now+1mo -A now+1mo example.com`
-z2=`$KEYGEN -K $dir -a rsasha1 -q3 -P now+1mo -A now+1mo example.com`
-z3=`$KEYGEN -K $dir -a rsasha1 -q3 -P now+1mo -A now+1mo example.com`
-z4=`$KEYGEN -K $dir -a rsasha1 -q3 -P now+1mo -A now+1mo example.com`
+k1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -q3fk -P now+1mo -A now+1mo example.com`
+z1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -q3 -P now+1mo -A now+1mo example.com`
+z2=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -q3 -P now+1mo -A now+1mo example.com`
+z3=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -q3 -P now+1mo -A now+1mo example.com`
+z4=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -q3 -P now+1mo -A now+1mo example.com`
 
 # Test 12: Many keys all simultaneously scheduled to be active in the past
 dir=12-many-active
 echo_i "set up $dir"
-k1=`$KEYGEN -K $dir -a rsasha1 -q3fk example.com`
-z1=`$KEYGEN -K $dir -a rsasha1 -q3 example.com`
-z2=`$KEYGEN -K $dir -a rsasha1 -q3 example.com`
-z3=`$KEYGEN -K $dir -a rsasha1 -q3 example.com`
-z4=`$KEYGEN -K $dir -a rsasha1 -q3 example.com`
+k1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -q3fk example.com`
+z1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -q3 example.com`
+z2=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -q3 example.com`
+z3=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -q3 example.com`
+z4=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -q3 example.com`
 
 # Test 13: Multiple simultaneous keys with no configured roll period
 dir=13-noroll
 echo_i "set up $dir"
-k1=`$KEYGEN -K $dir -a rsasha1 -q3fk example.com`
-k2=`$KEYGEN -K $dir -a rsasha1 -q3fk example.com`
-k3=`$KEYGEN -K $dir -a rsasha1 -q3fk example.com`
-z1=`$KEYGEN -K $dir -a rsasha1 -q3 example.com`
+k1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -q3fk example.com`
+k2=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -q3fk example.com`
+k3=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -q3fk example.com`
+z1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -q3 example.com`
 
 # Test 14: Keys exist but have the wrong algorithm
 dir=14-wrongalg
 echo_i "set up $dir"
-k1=`$KEYGEN -K $dir -a rsasha1 -qfk example.com`
-z1=`$KEYGEN -K $dir -a rsasha1 -q example.com`
+k1=`$KEYGEN -K $dir -a ${ALTERNATIVE_ALGORITHM} -qfk example.com`
+z1=`$KEYGEN -K $dir -a ${ALTERNATIVE_ALGORITHM} -q example.com`
 $SETTIME -K $dir -I now+6mo -D now+8mo $z1 > /dev/null
 z2=`$KEYGEN -K $dir -q -S ${z1}.key`
 $SETTIME -K $dir -I now+1y -D now+14mo $z2 > /dev/null
@@ -140,8 +140,8 @@ z4=`$KEYGEN -K $dir -q -S ${z3}.key`
 # Test 15: No zones specified; just search the directory for keys
 dir=15-unspec
 echo_i "set up $dir"
-k1=`$KEYGEN -K $dir -a rsasha1 -q3fk example.com`
-z1=`$KEYGEN -K $dir -a rsasha1 -q3 example.com`
+k1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -q3fk example.com`
+z1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -q3 example.com`
 $SETTIME -K $dir -I now+6mo -D now+8mo $z1 > /dev/null
 z2=`$KEYGEN -K $dir -q -S ${z1}.key`
 $SETTIME -K $dir -I now+1y -D now+14mo $z2 > /dev/null
@@ -153,8 +153,8 @@ z4=`$KEYGEN -K $dir -q -S ${z3}.key`
 # keys have the wrong algorithm for their policies
 dir=16-wrongalg-unspec
 echo_i "set up $dir"
-k1=`$KEYGEN -K $dir -a rsasha1 -qfk example.com`
-z1=`$KEYGEN -K $dir -a rsasha1 -q example.com`
+k1=`$KEYGEN -K $dir -a ${ALTERNATIVE_ALGORITHM} -qfk example.com`
+z1=`$KEYGEN -K $dir -a ${ALTERNATIVE_ALGORITHM} -q example.com`
 $SETTIME -K $dir -I now+6mo -D now+8mo $z1 > /dev/null
 z2=`$KEYGEN -K $dir -q -S ${z1}.key`
 $SETTIME -K $dir -I now+1y -D now+14mo $z2 > /dev/null
@@ -166,23 +166,27 @@ z4=`$KEYGEN -K $dir -q -S ${z3}.key`
 # flag (this should fail)
 dir=17-noforce
 echo_i "set up $dir"
-k1=`$KEYGEN -K $dir -a rsasha1 -q3fk example.com`
-z1=`$KEYGEN -K $dir -a rsasha1 -q3 example.com`
-z2=`$KEYGEN -K $dir -a rsasha1 -q3 example.com`
-z3=`$KEYGEN -K $dir -a rsasha1 -q3 example.com`
-z4=`$KEYGEN -K $dir -a rsasha1 -q3 example.com`
+k1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -q3fk example.com`
+z1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -q3 example.com`
+z2=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -q3 example.com`
+z3=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -q3 example.com`
+z4=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -q3 example.com`
 
 # Test 18: Prepublication interval is set to a nonstandard value
 dir=18-nonstd-prepub
 echo_i "set up $dir"
-ksk1=`$KEYGEN -K $dir -a rsasha1 -3fk example.com`
-zsk1=`$KEYGEN -K $dir -a rsasha1 -3 example.com`
+ksk1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -3fk example.com`
+zsk1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -3 example.com`
 $SETTIME -K $dir -I now+2mo -D now+3mo $zsk1 > /dev/null
 
 # Test 19: Key has been published/active a long time
 dir=19-old-keys
 echo_i "set up $dir"
-ksk1=`$KEYGEN -K $dir -a rsasha1 -3fk example.com`
-zsk1=`$KEYGEN -K $dir -a rsasha1 -3 example.com`
+ksk1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -3fk example.com`
+zsk1=`$KEYGEN -K $dir -a ${DEFAULT_ALGORITHM} -3 example.com`
 $SETTIME -K $dir -P now-2y -A now-2y $ksk1 > /dev/null
 $SETTIME -K $dir -P now-2y -A now-2y $zsk1 > /dev/null
+
+copy_setports policy.conf.in policy.conf
+copy_setports 18-nonstd-prepub/policy.conf.in 18-nonstd-prepub/policy.conf
+copy_setports 19-old-keys/policy.conf.in 19-old-keys/policy.conf