From: Mark Andrews <marka@isc.org>
Date: Thu, 7 Jul 2022 08:23:17 +0000 (+1000)
Subject: chain: use $DEFAULT_ALGORITHM
X-Git-Tag: v9.19.4~44^2~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3419178bd28ca3c37ca1f13f768c689ced603aa9;p=thirdparty%2Fbind9.git

chain: use $DEFAULT_ALGORITHM
---

diff --git a/bin/tests/system/chain/ns2/sign.sh b/bin/tests/system/chain/ns2/sign.sh
index d695323fa7c..90d1912f3f3 100644
--- a/bin/tests/system/chain/ns2/sign.sh
+++ b/bin/tests/system/chain/ns2/sign.sh
@@ -17,38 +17,38 @@ zone=example.
 zonefile=example.db
 signedfile=example.db.signed
 
-ksk=`$KEYGEN -q -a RSASHA256 -b 2048 -fk $zone`
-zsk=`$KEYGEN -q -a RSASHA256 -b 1024 $zone`
+ksk=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -b ${DEFAULT_BITS} -fk $zone)
+zsk=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -b ${DEFAULT_BITS} $zone)
 $SIGNER -S -o $zone -f $signedfile $zonefile > /dev/null
 
 zone=wildcard-secure.example.
 zonefile=wildcard-secure.db
 signedfile=wildcard-secure.example.db.signed
 
-ksk=`$KEYGEN -q -a RSASHA256 -b 2048 -fk $zone`
-zsk=`$KEYGEN -q -a RSASHA256 -b 1024 $zone`
+ksk=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -b ${DEFAULT_BITS} -fk $zone)
+zsk=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -b ${DEFAULT_BITS} $zone)
 $SIGNER -S -o $zone -f $signedfile $zonefile > /dev/null
 
 zone=wildcard-nsec.example.
 zonefile=wildcard.db
 signedfile=wildcard-nsec.example.db.signed
 
-ksk=`$KEYGEN -q -a RSASHA256 -b 2048 -fk $zone`
-zsk=`$KEYGEN -q -a RSASHA256 -b 1024 $zone`
+ksk=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -b ${DEFAULT_BITS} -fk $zone)
+zsk=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -b ${DEFAULT_BITS} $zone)
 $SIGNER -S -o $zone -f $signedfile $zonefile > /dev/null
 
 zone=wildcard-nsec3.example.
 zonefile=wildcard.db
 signedfile=wildcard-nsec3.example.db.signed
 
-ksk=`$KEYGEN -q -a RSASHA256 -b 2048 -fk $zone`
-zsk=`$KEYGEN -q -a RSASHA256 -b 1024 $zone`
+ksk=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -b ${DEFAULT_BITS} -fk $zone)
+zsk=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -b ${DEFAULT_BITS} $zone)
 $SIGNER -S -3 - -H 0 -o $zone -f $signedfile $zonefile > /dev/null
 
 zone=wildcard-nsec3-optout.example.
 zonefile=wildcard.db
 signedfile=wildcard-nsec3-optout.example.db.signed
 
-ksk=`$KEYGEN -q -a RSASHA256 -b 2048 -fk $zone`
-zsk=`$KEYGEN -q -a RSASHA256 -b 1024 $zone`
+ksk=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -b ${DEFAULT_BITS} -fk $zone)
+zsk=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -b ${DEFAULT_BITS} $zone)
 $SIGNER -S -3 - -H 0 -A -o $zone -f $signedfile $zonefile > /dev/null