rootkeysentinel: use $DEFAULT_ALGORITHM

(cherry picked from commit b0e1d9b1b3)
This commit is contained in:
Mark Andrews 2022-07-08 11:44:13 +10:00
parent e756c4c0f3
commit b57457e754
2 changed files with 10 additions and 8 deletions

View file

@ -17,8 +17,8 @@ zone=.
infile=root.db.in
zonefile=root.db
keyname=`$KEYGEN -q -a RSASHA256 -b 1024 -n zone $zone`
keyid=`expr ${keyname} : 'K.+008+\(.*\)'`
keyname=$($KEYGEN -q -a ${DEFAULT_ALGORITHM} -n zone $zone)
keyid=$(expr ${keyname} : 'K.+[0-9][0-9][0-9]+\(.*\)')
(cd ../ns2 && $SHELL sign.sh ${keyid:-00000} )

View file

@ -11,11 +11,13 @@
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
# leave as expr as expr treats arguments with leading 0's as base 10
# handle exit code 1 from expr when the result is 0
oldid=${1:-00000}
newid=`expr \( ${oldid} + 1000 \) % 65536`
newid=`expr "0000${newid}" : '.*\(.....\)$'`
badid=`expr \( ${oldid} + 7777 \) % 65536`
badid=`expr "0000${badid}" : '.*\(.....\)$'`
newid=$(expr \( ${oldid} + 1000 \) % 65536 || true)
newid=$(expr "0000${newid}" : '.*\(.....\)$') # prepend leading 0's
badid=$(expr \( ${oldid} + 7777 \) % 65536 || true)
badid=$(expr "0000${badid}" : '.*\(.....\)$') # prepend leading 0's
. ../../conf.sh
@ -23,8 +25,8 @@ zone=example.
infile=example.db.in
zonefile=example.db
keyname1=`$KEYGEN -q -a $DEFAULT_ALGORITHM -b $DEFAULT_BITS -n zone $zone`
keyname2=`$KEYGEN -q -a $DEFAULT_ALGORITHM -b $DEFAULT_BITS -n zone $zone`
keyname1=$($KEYGEN -q -a $DEFAULT_ALGORITHM -b $DEFAULT_BITS -n zone $zone)
keyname2=$($KEYGEN -q -a $DEFAULT_ALGORITHM -b $DEFAULT_BITS -n zone $zone)
cat $infile $keyname1.key $keyname2.key >$zonefile
echo root-key-sentinel-is-ta-$oldid A 10.53.0.1 >> $zonefile