only check the bit map

(cherry picked from commit a94db466314542759f3144e77f64c3fcc9c78ce0)
(cherry picked from commit 092b739535770e613fac20e349622b3907b5a320)

diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c
index dc32c905f24a4d635ada42813fdbd76fae3cc47d..004e35873d25e91eed21be05807cd624aab5cc6a 100644 (file)
--- a/bin/dnssec/dnssectool.c
+++ b/bin/dnssec/dnssectool.c
@@ -625,6 +625,21 @@ goodsig(dns_name_t *origin, dns_rdata_t *sigrdata, dns_name_t *name,
        return (ISC_FALSE);
 }
 
+static isc_boolean_t
+nsec_bitmap_equal(dns_rdata_nsec_t *nsec, dns_rdata_t *rdata) {
+       isc_result_t result;
+       dns_rdata_nsec_t tmpnsec;
+
+       result = dns_rdata_tostruct(rdata, &tmpnsec, NULL);
+       RUNTIME_CHECK(result == ISC_R_SUCCESS);
+
+       if (nsec->len != tmpnsec.len ||
+           memcmp(nsec->typebits, tmpnsec.typebits, nsec->len) != 0) {
+               return (ISC_FALSE);
+       }
+       return (ISC_TRUE);
+}
+
 static isc_result_t
 verifynsec(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
           dns_dbnode_t *node, dns_name_t *nextname)
@@ -668,7 +683,7 @@ verifynsec(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
        result = dns_nsec_buildrdata(db, ver, node, nextname, buffer,
                                     &tmprdata);
        check_result(result, "dns_nsec_buildrdata()");
-       if (dns_rdata_compare(&rdata, &tmprdata) != 0) {
+       if (!nsec_bitmap_equal(&nsec, &tmprdata)) {
                dns_name_format(name, namebuf, sizeof(namebuf));
                fprintf(stderr, "Bad NSEC record for %s, bit map "
                                "mismatch\n", namebuf);

diff --git a/bin/tests/system/verify/clean.sh b/bin/tests/system/verify/clean.sh
index 7479b86edae246369985d8987934fed265384fae..74c9be2c2c7da2f9792bee62c6c8f763d6dfc936 100644 (file)
--- a/bin/tests/system/verify/clean.sh
+++ b/bin/tests/system/verify/clean.sh
@@ -7,12 +7,11 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-rm -f zones/*.good
-rm -f zones/*.good.tmp
+rm -f ns*/named.lock
+rm -f verify.out*
 rm -f zones/*.bad
-rm -f zones/*.bad.tmp
+rm -f zones/*.good
 rm -f zones/*.out*
-rm -f zones/dsset-*
+rm -f zones/*.tmp
 rm -f zones/K*
-rm -f verify.out*
-rm -f ns*/named.lock
+rm -f zones/dsset-*

diff --git a/bin/tests/system/verify/zones/genzones.sh b/bin/tests/system/verify/zones/genzones.sh
index 594aca9f3a55dd498a26710a65b8bb778da8cfb5..8d8906663019746307396e94bb5cf616f36ce614 100644 (file)
--- a/bin/tests/system/verify/zones/genzones.sh
+++ b/bin/tests/system/verify/zones/genzones.sh
@@ -75,6 +75,28 @@ cp unsigned.db ${file}.tmp
 echo "@ DNAME data" >> ${file}.tmp
 $SIGNER -3 - -SP -o ${zone} -f ${file} ${file}.tmp > s.out$n 2>&1 || dumpit s.out$n
 
+#
+# generate an NSEC record like
+#      aba NSEC FOO ...
+# then downcase all the FOO records so the next name in the database
+# becomes foo when the zone is loaded.
+#
+setup nsec-next-name-case-mismatch good
+ksk=`$KEYGEN -a rsasha256 -fK ${zone} 2> kg2.out$n` || dumpit kg2.out$n
+zsk=`$KEYGEN -a rsasha256 ${zone} 2> kg2.out$n` || dumpit kg2.out$n
+cat << EOF > ${zone}.tmp
+\$TTL 0
+@ IN SOA  foo . ( 1 28800 7200 604800 1800 )
+@ NS foo
+\$include $ksk.key
+\$include $zsk.key
+FOO AAAA ::1
+FOO A 127.0.0.2
+aba CNAME FOO
+EOF
+$SIGNER -zP -o ${zone} -f ${file}.tmp ${zone}.tmp > s.out$n 2>&1 || dumpit s.out$n
+sed 's/^FOO\./foo\./' < ${file}.tmp > ${file}
+
 # A set of zones with only DNSKEY records.
 setup zsk-only.dnskeyonly bad
 key1=`$KEYGEN -r $RANDFILE ${zone} 2>kg.out` || dumpit kg.out$n