From fd13fef2999767e71e4aa4847023efac20f3e789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Fri, 8 Mar 2019 13:47:13 +0100 Subject: [PATCH] Fix regex used for mangling druz/DNSKEY During "dlv" system test setup, the "sed" regex used for mangling the DNSKEY RRset for the "druz" zone does not include the plus sign ("+"), which may: - cause the replacement to happen near the end of DNSKEY RDATA, which can cause the latter to become an invalid Base64 string, - prevent the replacement from being performed altogether. Both cases prevent the "dlv" system test from behaving as intended and may trigger false positives. Add the missing character to the aforementioned regex to ensure the replacement is always performed on bytes 10-25 of DNSKEY RDATA. --- bin/tests/system/dlv/ns2/sign.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/tests/system/dlv/ns2/sign.sh b/bin/tests/system/dlv/ns2/sign.sh index 5c34418895..8367725735 100755 --- a/bin/tests/system/dlv/ns2/sign.sh +++ b/bin/tests/system/dlv/ns2/sign.sh @@ -32,6 +32,6 @@ cat $infile $keyname1.key $keyname2.key >$zonefile $SIGNER -l $dlvzone -g -o $zone -f $outfile $zonefile > /dev/null 2> signer.err || cat signer.err $CHECKZONE -q -D -i none druz druz.pre | -sed '/IN DNSKEY/s/\([a-z0-9A-Z/]\{10\}\)[a-z0-9A-Z/]\{16\}/\1XXXXXXXXXXXXXXXX/'> druz.signed +sed '/IN DNSKEY/s/\([a-z0-9A-Z+/]\{10\}\)[a-z0-9A-Z+/]\{16\}/\1XXXXXXXXXXXXXXXX/'> druz.signed echo_i "signed $zone"