Merge branch 'matthijs-kasp-system-test-nit-fixes-v9_18' into 'bind-9.18'

Two minor fixes in the kasp system test

See merge request isc-projects/bind9!8390
This commit is contained in:
Matthijs Mekking
2023-10-16 11:19:33 +00:00

View File

@@ -171,7 +171,7 @@ $SIGNER -PS -x -o $zone -O raw -f "${zonefile}.signed" $infile > signer.out.$zon
setup dynamic-signed-inline-signing.kasp
T="now-1d"
csktimes="-P $T -A $T -P sync $T"
CSK=$($KEYGEN -a $DEFAULT_ALGORITHM -L 3600 -f KSK $ksktimes $zone 2> keygen.out.$zone.1)
CSK=$($KEYGEN -a $DEFAULT_ALGORITHM -L 3600 -f KSK $csktimes $zone 2> keygen.out.$zone.1)
$SETTIME -s -g $O -d $O $T -k $O $T -z $O $T -r $O $T "$CSK" > settime.out.$zone.1 2>&1
cat template.db.in "${CSK}.key" > "$infile"
cp $infile $zonefile
@@ -345,7 +345,6 @@ cat template.db.in "${CSK}.key" > "$infile"
private_type_record $zone $DEFAULT_ALGORITHM_NUMBER "$CSK" >> "$infile"
cp $infile $zonefile
$SIGNER -S -z -x -s now-1h -e now+30d -o $zone -O raw -f "${zonefile}.signed" $infile > signer.out.$zone.1 2>&1
setup step4.enable-dnssec.autosign
#
# The zones at zsk-prepub.autosign represent the various steps of a ZSK