From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Wed, 1 Aug 2018 16:36:55 +0000 (+0200)
Subject: nitpick in NSEC3 proofs: simplify an assertion
X-Git-Tag: v2.7.0~5^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b065783f2eece396b4c127ec21faec237017c613;p=thirdparty%2Fknot-dns.git

nitpick in NSEC3 proofs: simplify an assertion
---

diff --git a/src/knot/nameserver/nsec_proofs.c b/src/knot/nameserver/nsec_proofs.c
index 9f8f9bcd62..930920b2f7 100644
--- a/src/knot/nameserver/nsec_proofs.c
+++ b/src/knot/nameserver/nsec_proofs.c
@@ -117,17 +117,16 @@ static const zone_node_t *nsec3_encloser(const zone_node_t *closest)
 static const knot_dname_t *get_next_closer(const knot_dname_t *closest_encloser,
                                            const knot_dname_t *name)
 {
+	// make name only one label longer than closest_encloser
 	size_t ce_labels = knot_dname_labels(closest_encloser, NULL);
 	size_t qname_labels = knot_dname_labels(name, NULL);
-
-	// the common labels should match
-	assert(knot_dname_matched_labels(closest_encloser, name) == ce_labels);
-
-	// chop some labels from the qname
 	for (int i = 0; i < (qname_labels - ce_labels - 1); ++i) {
 		name = knot_wire_next_label(name, NULL);
 	}
 
+	// the common labels should match
+	assert(knot_dname_is_equal(knot_wire_next_label(name, NULL), closest_encloser));
+
 	return name;
 }