From: Mark Andrews Date: Fri, 8 Jul 2022 01:22:03 +0000 (+1000) Subject: staticstub: use $DEFAULT_ALGORITHM X-Git-Tag: v9.19.4~44^2~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32337b9dbf995014de00c80e217fef8ab0b57b50;p=thirdparty%2Fbind9.git staticstub: use $DEFAULT_ALGORITHM --- diff --git a/bin/tests/system/staticstub/ns3/sign.sh b/bin/tests/system/staticstub/ns3/sign.sh index 36c865ea2cc..168dfa2a353 100755 --- a/bin/tests/system/staticstub/ns3/sign.sh +++ b/bin/tests/system/staticstub/ns3/sign.sh @@ -21,8 +21,8 @@ zonefile=example.db cp ../ns4/dsset-sub.example. . -keyname1=`$KEYGEN -q -a RSASHA256 -b 1024 -n zone $zone` -keyname2=`$KEYGEN -q -a RSASHA256 -b 2048 -f KSK -n zone $zone` +keyname1=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -n zone $zone) +keyname2=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -f KSK -n zone $zone) cat $infile $keyname1.key $keyname2.key > $zonefile $SIGNER -g -o $zone $zonefile > /dev/null @@ -33,8 +33,8 @@ keyfile_to_static_ds $keyname2 > trusted.conf zone=undelegated infile=undelegated.db.in zonefile=undelegated.db -keyname1=`$KEYGEN -q -a RSASHA256 -b 1024 -n zone $zone` -keyname2=`$KEYGEN -q -a RSASHA256 -b 2048 -f KSK -n zone $zone` +keyname1=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -n zone $zone) +keyname2=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -f KSK -n zone $zone) cat $infile $keyname1.key $keyname2.key > $zonefile $SIGNER -g -o $zone $zonefile > /dev/null diff --git a/bin/tests/system/staticstub/ns4/sign.sh b/bin/tests/system/staticstub/ns4/sign.sh index 43f985a1260..05980169149 100755 --- a/bin/tests/system/staticstub/ns4/sign.sh +++ b/bin/tests/system/staticstub/ns4/sign.sh @@ -17,8 +17,8 @@ zone=sub.example infile=${zone}.db.in zonefile=${zone}.db -keyname1=`$KEYGEN -q -a NSEC3RSASHA1 -b 1024 -n zone $zone` -keyname2=`$KEYGEN -q -a NSEC3RSASHA1 -b 1024 -f KSK -n zone $zone` +keyname1=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -n zone $zone) +keyname2=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -f KSK -n zone $zone) cat $infile $keyname1.key $keyname2.key > $zonefile