rename keyfile_to_*_keys system test shell functions

- keyfile_to_trusted_keys -> keyfile_to_static_keys
- keyfile_to_managed_keys -> keyfile_to_initial_keys

diff --git a/bin/tests/system/autosign/ns1/keygen.sh b/bin/tests/system/autosign/ns1/keygen.sh
index 20ca32f27b7f021ea135443f52d1d8a9831952ba..6ba8f95df9fcc45dc0c72b180a951d381be69f8b 100644 (file)
--- a/bin/tests/system/autosign/ns1/keygen.sh
+++ b/bin/tests/system/autosign/ns1/keygen.sh
@@ -33,12 +33,12 @@ rm $zsknopriv.private
 ksksby=`$KEYGEN -3 -a RSASHA1 -q -P now -A now+15s -fk $zone`
 kskrev=`$KEYGEN -3 -a RSASHA1 -q -R now+15s -fk $zone`
 
-keyfile_to_trusted_keys $ksksby > trusted.conf
+keyfile_to_static_keys $ksksby > trusted.conf
 cp trusted.conf ../ns2/trusted.conf
 cp trusted.conf ../ns3/trusted.conf
 cp trusted.conf ../ns4/trusted.conf
 
-keyfile_to_trusted_keys $kskrev > trusted.conf
+keyfile_to_static_keys $kskrev > trusted.conf
 cp trusted.conf ../ns5/trusted.conf
 
 echo $zskact > ../active.key

diff --git a/bin/tests/system/autosign/ns2/keygen.sh b/bin/tests/system/autosign/ns2/keygen.sh
index 2f7d438b4cb0a4230b0cdfaa3002208a1e12f5cc..0c8b5078d91fb86f34080817a40f7d9bad6898e2 100644 (file)
--- a/bin/tests/system/autosign/ns2/keygen.sh
+++ b/bin/tests/system/autosign/ns2/keygen.sh
@@ -37,7 +37,7 @@ zonefile="${zone}.db"
 infile="${zonefile}.in"
 ksk=`$KEYGEN -a RSASHA1 -3 -q -fk $zone`
 $KEYGEN -a RSASHA1 -3 -q $zone > /dev/null
-keyfile_to_trusted_keys $ksk > private.conf
+keyfile_to_static_keys $ksk > private.conf
 cp private.conf ../ns4/private.conf
 $SIGNER -S -3 beef -A -o $zone -f $zonefile $infile > /dev/null 2>&1
 

diff --git a/bin/tests/system/conf.sh.common b/bin/tests/system/conf.sh.common
index 1eb8db8053548f9a17fbaac8c3e685e3ed5f6220..9f55b18f32cb14c3bbbfeb12c18041cd63b4562e 100644 (file)
--- a/bin/tests/system/conf.sh.common
+++ b/bin/tests/system/conf.sh.common
@@ -225,17 +225,17 @@ keyfile_to_keys_section() {
     echo "};"
 }
 
-# keyfile_to_trusted_keys: convert key data contained in the keyfile(s)
+# keyfile_to_static_keys: convert key data contained in the keyfile(s)
 # provided to a *static* "dnssec-keys" section suitable for including in a
 # resolver's configuration file
-keyfile_to_trusted_keys() {
+keyfile_to_static_keys() {
     keyfile_to_keys_section "dnssec-keys" "static-key" $*
 }
 
-# keyfile_to_managed_keys: convert key data contained in the keyfile(s)
-# provided to a "dnssec-keys" section suitable for including in a
-# resolver's configuration file
-keyfile_to_managed_keys() {
+# keyfile_to_initial_keys: convert key data contained in the keyfile(s)
+# provided to an *initialzing* "dnssec-keys" section suitable for including
+# in a resolver's configuration file
+keyfile_to_initial_keys() {
     keyfile_to_keys_section "dnssec-keys" "initial-key" $*
 }
 

diff --git a/bin/tests/system/dlv/ns1/sign.sh b/bin/tests/system/dlv/ns1/sign.sh
index 1c56240a44754d4df3cb07a60d0f139fa60cbcd1..487d609a7f9cd8b91a2faac93b83c50367f2dec2 100755 (executable)
--- a/bin/tests/system/dlv/ns1/sign.sh
+++ b/bin/tests/system/dlv/ns1/sign.sh
@@ -32,7 +32,7 @@ $SIGNER -g -o $zone -f $outfile $zonefile > /dev/null 2> signer.err || cat signe
 
 echo_i "signed $zone"
 
-keyfile_to_trusted_keys $keyname2 > trusted.conf
+keyfile_to_static_keys $keyname2 > trusted.conf
 cp trusted.conf ../ns5
 cp trusted.conf ../ns7
 cp trusted.conf ../ns8

diff --git a/bin/tests/system/dlv/ns3/sign.sh b/bin/tests/system/dlv/ns3/sign.sh
index cd39b600e26da82473bf08331a4aa4e8ecbcc9b2..3c8fbdc5d0188686261bad3858ec37f6e236fe4c 100755 (executable)
--- a/bin/tests/system/dlv/ns3/sign.sh
+++ b/bin/tests/system/dlv/ns3/sign.sh
@@ -378,18 +378,18 @@ do
        case $zone in
        "dlv.utld")
                $SIGNER -O full -o $zone -f $outfile $zonefile > /dev/null 2> signer.err || cat signer.err
-               keyfile_to_trusted_keys $keyname2 > ../ns5/trusted-dlv.conf
+               keyfile_to_static_keys $keyname2 > ../ns5/trusted-dlv.conf
                ;;
        "disabled-algorithm-dlv.utld")
                $SIGNER -O full -o $zone -f $outfile $zonefile > /dev/null 2> signer.err || cat signer.err
-               keyfile_to_trusted_keys $keyname2 > ../ns8/trusted-dlv-disabled.conf
+               keyfile_to_static_keys $keyname2 > ../ns8/trusted-dlv-disabled.conf
                ;;
        "unsupported-algorithm-dlv.utld")
                cp ${keyname2}.key ${keyname2}.tmp
                $SIGNER -O full -o $zone -f ${outfile}.tmp $zonefile > /dev/null 2> signer.err || cat signer.err
                awk '$4 == "DNSKEY" { $7 = 255 } $4 == "RRSIG" { $6 = 255 } { print }' ${outfile}.tmp > $outfile
                awk '$3 == "DNSKEY" { $6 = 255 } { print }' ${keyname2}.tmp > ${keyname2}.key
-               keyfile_to_trusted_keys $keyname2 > ../ns7/trusted-dlv-unsupported.conf
+               keyfile_to_static_keys $keyname2 > ../ns7/trusted-dlv-unsupported.conf
                ;;
        esac
 

diff --git a/bin/tests/system/dnssec/ns1/sign.sh b/bin/tests/system/dnssec/ns1/sign.sh
index effebd6f55eee8fb63068976de3efe92b83ebdf6..5c223ba81457d82c26a01a54310da1a3c13958f5 100644 (file)
--- a/bin/tests/system/dnssec/ns1/sign.sh
+++ b/bin/tests/system/dnssec/ns1/sign.sh
@@ -37,8 +37,8 @@ cat "$infile" "$keyname.key" > "$zonefile"
 
 "$SIGNER" -P -g -o "$zone" "$zonefile" > /dev/null 2>&1
 
-# Configure the resolving server with a trusted key.
-keyfile_to_trusted_keys "$keyname" > trusted.conf
+# Configure the resolving server with a staitc key.
+keyfile_to_static_keys "$keyname" > trusted.conf
 cp trusted.conf ../ns2/trusted.conf
 cp trusted.conf ../ns3/trusted.conf
 cp trusted.conf ../ns4/trusted.conf
@@ -46,8 +46,8 @@ cp trusted.conf ../ns6/trusted.conf
 cp trusted.conf ../ns7/trusted.conf
 cp trusted.conf ../ns9/trusted.conf
 
-# ...or with a managed key.
-keyfile_to_managed_keys "$keyname" > managed.conf
+# ...or with an initializing key.
+keyfile_to_initial_keys "$keyname" > managed.conf
 cp managed.conf ../ns4/managed.conf
 
 #

diff --git a/bin/tests/system/dnssec/ns3/sign.sh b/bin/tests/system/dnssec/ns3/sign.sh
index e6e45d6c6c73c9f6d39d1db64ad90ca481742b04..eddaf3efe086fbd6cd5700cf7218e5d1dcb8dad0 100644 (file)
--- a/bin/tests/system/dnssec/ns3/sign.sh
+++ b/bin/tests/system/dnssec/ns3/sign.sh
@@ -66,10 +66,10 @@ do
 
        case $tld in
        "managed")
-               keyfile_to_managed_keys $keyname1 $keyname2 $keyname3 $keyname4 $keyname5 > ../ns8/managed.conf
+               keyfile_to_initial_keys $keyname1 $keyname2 $keyname3 $keyname4 $keyname5 > ../ns8/managed.conf
                ;;
        "trusted")
-               keyfile_to_trusted_keys $keyname1 $keyname2 $keyname3 $keyname4 $keyname5 > ../ns8/trusted.conf
+               keyfile_to_static_keys $keyname1 $keyname2 $keyname3 $keyname4 $keyname5 > ../ns8/trusted.conf
                ;;
        esac
 done

diff --git a/bin/tests/system/dnssec/ns5/sign.sh b/bin/tests/system/dnssec/ns5/sign.sh
index 83f08769c05fbc0bb58900380ba1c938a3468911..1c226d5f95fa237ab56fd7c53e491fc26516df8c 100644 (file)
--- a/bin/tests/system/dnssec/ns5/sign.sh
+++ b/bin/tests/system/dnssec/ns5/sign.sh
@@ -23,7 +23,7 @@ zonefile=root.db.signed
 keyname=$("$KEYGEN" -q -a "$DEFAULT_ALGORITHM" -b "$DEFAULT_BITS" -f KSK "$zone")
 
 # copy the KSK out first, then revoke it
-keyfile_to_managed_keys "$keyname" > revoked.conf
+keyfile_to_initial_keys "$keyname" > revoked.conf
 
 "$SETTIME" -R now "${keyname}.key" > /dev/null
 
@@ -34,4 +34,4 @@ keyfile_to_managed_keys "$keyname" > revoked.conf
 
 keyname=$("$KEYGEN" -q -a "$DEFAULT_ALGORITHM" -b "$DEFAULT_BITS" -n zone ".")
 
-keyfile_to_trusted_keys "$keyname" > trusted.conf
+keyfile_to_static_keys "$keyname" > trusted.conf

diff --git a/bin/tests/system/dsdigest/ns1/sign.sh b/bin/tests/system/dsdigest/ns1/sign.sh
index 12ba92625c9d3796151cfa3056b5a5fb617103db..dc893b16319f46afcd7000fc01c530b4172b2d88 100644 (file)
--- a/bin/tests/system/dsdigest/ns1/sign.sh
+++ b/bin/tests/system/dsdigest/ns1/sign.sh
@@ -28,8 +28,8 @@ cat $infile $key1.key $key2.key > $zonefile
 
 $SIGNER -P -g -o $zone $zonefile > /dev/null
 
-# Configure the resolving server with a trusted key.
-keyfile_to_trusted_keys $key2 > trusted.conf
+# Configure the resolving server with a static key.
+keyfile_to_static_keys $key2 > trusted.conf
 cp trusted.conf ../ns2/trusted.conf
 cp trusted.conf ../ns3/trusted.conf
 cp trusted.conf ../ns4/trusted.conf

diff --git a/bin/tests/system/ecdsa/ns1/sign.sh b/bin/tests/system/ecdsa/ns1/sign.sh
index a81a3eb61d5a3a43df51cd89bb559e3e379e80cd..518e01d8d10d829241cd555e099f12856bb38ea5 100644 (file)
--- a/bin/tests/system/ecdsa/ns1/sign.sh
+++ b/bin/tests/system/ecdsa/ns1/sign.sh
@@ -24,6 +24,6 @@ cat $infile $key1.key $key2.key > $zonefile
 
 $SIGNER -P -g -o $zone $zonefile > /dev/null 2> signer.err || cat signer.err
 
-# Configure the resolving server with a trusted key.
-keyfile_to_trusted_keys $key1 > trusted.conf
+# Configure the resolving server with a static key.
+keyfile_to_static_keys $key1 > trusted.conf
 cp trusted.conf ../ns2/trusted.conf

diff --git a/bin/tests/system/eddsa/ns1/sign.sh b/bin/tests/system/eddsa/ns1/sign.sh
index 85a6cc503023e152703587f852415b0a46babf26..6806db8c5cee49987335b426b4802bb937f37555 100644 (file)
--- a/bin/tests/system/eddsa/ns1/sign.sh
+++ b/bin/tests/system/eddsa/ns1/sign.sh
@@ -25,8 +25,8 @@ cat $infile $key1.key $key2.key > $zonefile
 
 $SIGNER -P -g -o $zone $zonefile > /dev/null 2> signer.err || cat signer.err
 
-# Configure the resolving server with a trusted key.
-keyfile_to_trusted_keys $key1 > trusted.conf
+# Configure the resolving server with a static key.
+keyfile_to_static_keys $key1 > trusted.conf
 cp trusted.conf ../ns2/trusted.conf
 
 cd ../ns2 && $SHELL sign.sh

diff --git a/bin/tests/system/filter-aaaa/ns1/sign.sh b/bin/tests/system/filter-aaaa/ns1/sign.sh
index 71da6a751ef00d0d19c70ef10a8b35ba1e713bf4..b1b17e1a9d767fa96855b5e89e352bfdd2aaff96 100755 (executable)
--- a/bin/tests/system/filter-aaaa/ns1/sign.sh
+++ b/bin/tests/system/filter-aaaa/ns1/sign.sh
@@ -26,7 +26,7 @@ $KEYGEN -f KSK -a $DEFAULT_ALGORITHM $zone 2>&1 > keygen.out | cat_i
 keyname=`cat keygen.out`
 rm -f keygen.out
 
-keyfile_to_trusted_keys $keyname > trusted.conf
+keyfile_to_static_keys $keyname > trusted.conf
 cp trusted.conf ../ns2/trusted.conf
 cp trusted.conf ../ns3/trusted.conf
 cp trusted.conf ../ns5/trusted.conf

diff --git a/bin/tests/system/inline/ns1/sign.sh b/bin/tests/system/inline/ns1/sign.sh
index 97d82917587e175a8d9ddd0e2681c4cebb5663da..166f4b9c00fe374a1e6779331fea19074ea22753 100644 (file)
--- a/bin/tests/system/inline/ns1/sign.sh
+++ b/bin/tests/system/inline/ns1/sign.sh
@@ -20,5 +20,5 @@ keyname=`$KEYGEN -q -a RSASHA1 -b 1024 -n zone -f KSK $zone`
 $SIGNER -S -x -T 1200 -o ${zone} root.db > signer.out 2>&1
 [ $? = 0 ] || cat signer.out
 
-keyfile_to_trusted_keys $keyname > trusted.conf
+keyfile_to_static_keys $keyname > trusted.conf
 cp trusted.conf ../ns6/trusted.conf

diff --git a/bin/tests/system/legacy/ns7/sign.sh b/bin/tests/system/legacy/ns7/sign.sh
index 679c74de9cb2dd0f0aaf88d5b3cbbe2625203853..21ab3d1e5a4acb90be9bda5df7cbb6eb501a8f14 100755 (executable)
--- a/bin/tests/system/legacy/ns7/sign.sh
+++ b/bin/tests/system/legacy/ns7/sign.sh
@@ -28,5 +28,5 @@ cat $infile $keyname1.key $keyname2.key >$zonefile
 
 $SIGNER -g -o $zone -f $outfile -e +30y $zonefile > /dev/null 2> signer.err || cat signer.err
 
-keyfile_to_trusted_keys $keyname2 > trusted.conf
+keyfile_to_static_keys $keyname2 > trusted.conf
 cp trusted.conf ../ns1

diff --git a/bin/tests/system/mirror/ns1/sign.sh b/bin/tests/system/mirror/ns1/sign.sh
index 0382585541a2a2e3bdbc6da1b8ee450abd7a4091..2d483cd76ae521e3d3f1daeffa38325da0104211 100644 (file)
--- a/bin/tests/system/mirror/ns1/sign.sh
+++ b/bin/tests/system/mirror/ns1/sign.sh
@@ -33,4 +33,4 @@ $SIGNER -P -g -o $zone $zonefile > /dev/null
 # irrelevant here, so just reuse the root zone key generated above.
 sed "s/^\./nonexistent./;" $keyname1.key > $keyname1.modified.key
 
-keyfile_to_trusted_keys $keyname1 $keyname1.modified > trusted.conf
+keyfile_to_static_keys $keyname1 $keyname1.modified > trusted.conf

diff --git a/bin/tests/system/mirror/ns2/sign.sh b/bin/tests/system/mirror/ns2/sign.sh
index 140ebb940374770e6f77c8076a6ea1808cdd92c4..5553844f30fd9cba301edc2aeb724fca08da12b6 100644 (file)
--- a/bin/tests/system/mirror/ns2/sign.sh
+++ b/bin/tests/system/mirror/ns2/sign.sh
@@ -75,4 +75,4 @@ for variant in addzone axfr ixfr load reconfig untrusted; do
        fi
 done
 
-keyfile_to_trusted_keys $keys_to_trust > trusted-mirror.conf
+keyfile_to_static_keys $keys_to_trust > trusted-mirror.conf

diff --git a/bin/tests/system/mkeys/ns1/sign.sh b/bin/tests/system/mkeys/ns1/sign.sh
index 413fa200810dc0cb4f309a9e832d0cbd5804831f..0e631c3208f23c6f9d26c3094fae26e4d6df6642 100644 (file)
--- a/bin/tests/system/mkeys/ns1/sign.sh
+++ b/bin/tests/system/mkeys/ns1/sign.sh
@@ -20,14 +20,14 @@ zskkeyname=`$KEYGEN -a rsasha256 -q $zone`
 
 $SIGNER -Sg -o $zone $zonefile > /dev/null 2>/dev/null
 
-# Configure the resolving server with a managed trusted key.
-keyfile_to_managed_keys $keyname > managed.conf
+# Configure the resolving server with an initializing key.
+keyfile_to_initial_keys $keyname > managed.conf
 cp managed.conf ../ns2/managed.conf
 cp managed.conf ../ns4/managed.conf
 cp managed.conf ../ns5/managed.conf
 
-# Configure a trusted key statement (used by delv).
-keyfile_to_trusted_keys $keyname > trusted.conf
+# Configure a static key to be used by delv.
+keyfile_to_static_keys $keyname > trusted.conf
 
 # Prepare an unsupported algorithm key.
 unsupportedkey=Kunknown.+255+00000

diff --git a/bin/tests/system/mkeys/ns6/setup.sh b/bin/tests/system/mkeys/ns6/setup.sh
index 5ba1647da581a12b9896eddc193f9c929d32f828..2e032e710ab4f1ae50d7aa334b02080aad2850a4 100644 (file)
--- a/bin/tests/system/mkeys/ns6/setup.sh
+++ b/bin/tests/system/mkeys/ns6/setup.sh
@@ -26,5 +26,5 @@ cp unsupported-managed.key "${unsupportedkey}.key"
 rootkey=`cat ../ns1/managed.key`
 cp "../ns1/${rootkey}.key" .
 
-# Configure the resolving server with a managed trusted key.
-keyfile_to_managed_keys $unsupportedkey $rsakey $rootkey > managed.conf
+# Configure the resolving server with an initializing key.
+keyfile_to_initial_keys $unsupportedkey $rsakey $rootkey > managed.conf

diff --git a/bin/tests/system/mkeys/tests.sh b/bin/tests/system/mkeys/tests.sh
index 22409c2d1d74d30754fd4ed466a46a44963c1831..07bcee298d29a04d5ac62e0c3a90502a49827ab4 100644 (file)
--- a/bin/tests/system/mkeys/tests.sh
+++ b/bin/tests/system/mkeys/tests.sh
@@ -301,7 +301,7 @@ status=`expr $status + $ret`
 echo_i "reinitialize trust anchors, add second key to bind.keys"
 $PERL $SYSTEMTESTTOP/stop.pl --use-rndc --port ${CONTROLPORT} mkeys ns2
 rm -f ns2/managed-keys.bind*
-keyfile_to_managed_keys ns1/$original ns1/$standby1 > ns2/managed.conf
+keyfile_to_initial_keys ns1/$original ns1/$standby1 > ns2/managed.conf
 nextpart ns2/named.run > /dev/null
 $PERL $SYSTEMTESTTOP/start.pl --noclean --restart --port ${PORT} mkeys ns2
 

diff --git a/bin/tests/system/pending/ns1/sign.sh b/bin/tests/system/pending/ns1/sign.sh
index fa0350a5be3f38a9935662d63f183cecb5cef76e..fe3fa15612012b9f507f011e81654ca7324de01e 100644 (file)
--- a/bin/tests/system/pending/ns1/sign.sh
+++ b/bin/tests/system/pending/ns1/sign.sh
@@ -27,8 +27,8 @@ cat $infile $keyname1.key $keyname2.key > $zonefile
 
 $SIGNER -g -o $zone $zonefile > /dev/null 2>&1
 
-# Configure the resolving server with a trusted key.
-keyfile_to_trusted_keys $keyname2 > trusted.conf
+# Configure the resolving server with a static key.
+keyfile_to_static_keys $keyname2 > trusted.conf
 cp trusted.conf ../ns2/trusted.conf
 cp trusted.conf ../ns3/trusted.conf
 cp trusted.conf ../ns4/trusted.conf

diff --git a/bin/tests/system/resolver/ns6/keygen.sh b/bin/tests/system/resolver/ns6/keygen.sh
index d6272c815f4de03ab5a144bee30aa4d787233dcd..444e68a359d65b886a797b478b7893cf4f20f9f7 100644 (file)
--- a/bin/tests/system/resolver/ns6/keygen.sh
+++ b/bin/tests/system/resolver/ns6/keygen.sh
@@ -30,5 +30,5 @@ zsk=`$KEYGEN -q -a rsasha256 $zone`
 cat $ksk.key $zsk.key dsset-ds.example.net$TP >> $zonefile
 $SIGNER -P -o $zone $zonefile > /dev/null 2>&1
 
-# Configure a trusted key statement (used by delv)
-keyfile_to_trusted_keys $ksk > ../ns5/trusted.conf
+# Configure a static key to be used by delv
+keyfile_to_static_keys $ksk > ../ns5/trusted.conf

diff --git a/bin/tests/system/rootkeysentinel/ns1/sign.sh b/bin/tests/system/rootkeysentinel/ns1/sign.sh
index b364237efa6deb562286570ccc3df1d1cd2c8676..50eb562763432f27546ed5e457e434543e4b7a2c 100644 (file)
--- a/bin/tests/system/rootkeysentinel/ns1/sign.sh
+++ b/bin/tests/system/rootkeysentinel/ns1/sign.sh
@@ -27,8 +27,8 @@ cat $infile $keyname.key > $zonefile
 
 $SIGNER -P -g -o $zone $zonefile > /dev/null
 
-# Configure the resolving server with a trusted key.
-keyfile_to_trusted_keys $keyname > trusted.conf
+# Configure the resolving server with a static key.
+keyfile_to_static_keys $keyname > trusted.conf
 cp trusted.conf ../ns2/trusted.conf
 cp trusted.conf ../ns3/trusted.conf
 cp trusted.conf ../ns4/trusted.conf

diff --git a/bin/tests/system/rsabigexponent/ns1/sign.sh b/bin/tests/system/rsabigexponent/ns1/sign.sh
index 2af6a145153dc356db90fa091d4cc108bad2ef1c..3b8d4adf69faa2cd3915ff8cc8c33a998727400a 100755 (executable)
--- a/bin/tests/system/rsabigexponent/ns1/sign.sh
+++ b/bin/tests/system/rsabigexponent/ns1/sign.sh
@@ -24,8 +24,8 @@ cat $infile $keyname.key > $zonefile
 
 $SIGNER -P -g -o $zone $zonefile > /dev/null
 
-# Configure the resolving server with a trusted key.
-keyfile_to_trusted_keys $keyname > trusted.conf
+# Configure the resolving server with a static key.
+keyfile_to_static_keys $keyname > trusted.conf
 cp trusted.conf ../ns2/trusted.conf
 cp trusted.conf ../ns3/trusted.conf
 

diff --git a/bin/tests/system/sfcache/ns1/sign.sh b/bin/tests/system/sfcache/ns1/sign.sh
index f448ecca8674971934622f8d2c55c278a43cfec9..c1acdce5009aa5a3f1bfc9a25427219770d79ead 100644 (file)
--- a/bin/tests/system/sfcache/ns1/sign.sh
+++ b/bin/tests/system/sfcache/ns1/sign.sh
@@ -28,9 +28,9 @@ cat "$infile" "$keyname.key" > "$zonefile"
 
 $SIGNER -P -g -o $zone $zonefile > /dev/null
 
-# Configure the resolving server with a trusted key.
-keyfile_to_trusted_keys "$keyname" > trusted.conf
+# Configure the resolving server with a static key.
+keyfile_to_static_keys "$keyname" > trusted.conf
 cp trusted.conf ../ns2/trusted.conf
 
-# ...or with a managed key.
-keyfile_to_managed_keys "$keyname" > managed.conf
+# ...or with an initializing key.
+keyfile_to_initial_keys "$keyname" > managed.conf

diff --git a/bin/tests/system/sfcache/ns5/sign.sh b/bin/tests/system/sfcache/ns5/sign.sh
index 9dcd9fe732abf5868530374050d5f886b7c2bec2..c369e545eb7e59f9fe28aaaf67696fab0f70d40d 100644 (file)
--- a/bin/tests/system/sfcache/ns5/sign.sh
+++ b/bin/tests/system/sfcache/ns5/sign.sh
@@ -16,4 +16,4 @@ set -e
 
 keyname=$("$KEYGEN" -q -a "$DEFAULT_ALGORITHM" -b "$DEFAULT_BITS" -n zone ".")
 
-keyfile_to_trusted_keys "$keyname" > trusted.conf
+keyfile_to_static_keys "$keyname" > trusted.conf

diff --git a/bin/tests/system/staticstub/ns3/sign.sh b/bin/tests/system/staticstub/ns3/sign.sh
index 0d1ab35f51d25c6ec449478966377923ef5d768d..3faf5c5d11e835fb0b04c3941132eb51a3e96017 100755 (executable)
--- a/bin/tests/system/staticstub/ns3/sign.sh
+++ b/bin/tests/system/staticstub/ns3/sign.sh
@@ -27,7 +27,7 @@ cat $infile $keyname1.key $keyname2.key > $zonefile
 $SIGNER -g -o $zone $zonefile > /dev/null 2>&1
 
 # Configure the resolving server with a trusted key.
-keyfile_to_trusted_keys $keyname2 > trusted.conf
+keyfile_to_static_keys $keyname2 > trusted.conf
 
 zone=undelegated
 infile=undelegated.db.in
@@ -38,5 +38,5 @@ cat $infile $keyname1.key $keyname2.key > $zonefile
 
 $SIGNER -g -o $zone $zonefile > /dev/null 2>&1
 
-keyfile_to_trusted_keys $keyname2 >> trusted.conf
+keyfile_to_static_keys $keyname2 >> trusted.conf
 cp trusted.conf ../ns2/trusted.conf

diff --git a/bin/tests/system/synthfromdnssec/ns1/sign.sh b/bin/tests/system/synthfromdnssec/ns1/sign.sh
index 706c49ee383009588f93f2389c791b17a44a2a3c..de7478df7803e25cfc7b17cc9b5620e9d682a5d1 100644 (file)
--- a/bin/tests/system/synthfromdnssec/ns1/sign.sh
+++ b/bin/tests/system/synthfromdnssec/ns1/sign.sh
@@ -39,5 +39,5 @@ cat "$infile" "$keyname.key" > "$zonefile"
 
 $SIGNER -P -g -o $zone $zonefile > /dev/null 2>&1
 
-# Configure the resolving server with a trusted key.
-keyfile_to_trusted_keys "$keyname" > trusted.conf
+# Configure the resolving server with a static key.
+keyfile_to_static_keys "$keyname" > trusted.conf

diff --git a/bin/tests/system/wildcard/ns1/sign.sh b/bin/tests/system/wildcard/ns1/sign.sh
index 3148dbb4020ef86f25c5d1ca268b56733219ca37..de80eb792219469f5756b87a5ea9738af6a6d615 100755 (executable)
--- a/bin/tests/system/wildcard/ns1/sign.sh
+++ b/bin/tests/system/wildcard/ns1/sign.sh
@@ -57,7 +57,7 @@ cat $infile $keyname1.key $keyname2.key > $zonefile
 $SIGNER -o $zone -f $outfile $zonefile > /dev/null 2> signer.err || cat signer.err
 echo_i "signed $zone"
 
-keyfile_to_trusted_keys $keyname2 > private.nsec.conf
+keyfile_to_static_keys $keyname2 > private.nsec.conf
 
 zone=nsec3
 infile=nsec3.db.in
@@ -86,7 +86,7 @@ cat $infile $keyname1.key $keyname2.key > $zonefile
 $SIGNER -3 - -H 10 -o $zone -f $outfile $zonefile > /dev/null 2> signer.err || cat signer.err
 echo_i "signed $zone"
 
-keyfile_to_trusted_keys $keyname2 > private.nsec3.conf
+keyfile_to_static_keys $keyname2 > private.nsec3.conf
 
 zone=.
 infile=root.db.in
@@ -101,4 +101,4 @@ cat $infile $keyname1.key $keyname2.key $dssets >$zonefile
 $SIGNER -o $zone -f $outfile $zonefile > /dev/null 2> signer.err || cat signer.err
 echo_i "signed $zone"
 
-keyfile_to_trusted_keys $keyname2 > trusted.conf
+keyfile_to_static_keys $keyname2 > trusted.conf