From: Matthijs Mekking <github@pletterpet.nl>
Date: Tue, 18 Dec 2018 21:06:08 +0000 (+0100)
Subject: Move REQUIRE outside comment unsupported alg
X-Git-Tag: v9.11.6rc1~74^2~2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=1360a1fa1a4eaddf839c79c823500f5d4363f506;p=thirdparty%2Fbind9.git

Move REQUIRE outside comment unsupported alg

(cherry picked from commit 5ca649967e661cd3f292913f54a72080da245523)
---

diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c
index b7afce1a73f..422e98e1787 100644
--- a/lib/dns/dnssec.c
+++ b/lib/dns/dnssec.c
@@ -1686,10 +1686,11 @@ dns_dnssec_keylistfromrdataset(dns_name_t *origin,
 		dns_rdata_reset(&rdata);
 		dns_rdataset_current(&keys, &rdata);
 
-		/* Skip unsupported algorithms */
 		REQUIRE(rdata.type == dns_rdatatype_key ||
 			rdata.type == dns_rdatatype_dnskey);
 		REQUIRE(rdata.length > 3);
+
+		/* Skip unsupported algorithms */
 		if (!dst_algorithm_supported(rdata.data[3]))
 			goto skip;
 
diff --git a/lib/dns/nsec3.c b/lib/dns/nsec3.c
index 978d03c7839..6ae7ca85e6c 100644
--- a/lib/dns/nsec3.c
+++ b/lib/dns/nsec3.c
@@ -1806,12 +1806,13 @@ dns_nsec3_maxiterations(dns_db_t *db, dns_dbversion_t *version,
 		dns_rdata_t rdata = DNS_RDATA_INIT;
 		dns_rdataset_current(&rdataset, &rdata);
 
-		/* Skip unsupported algorithms when
-		 * calculating the maximum iterations.
-		 */
 		REQUIRE(rdata.type == dns_rdatatype_key ||
 			rdata.type == dns_rdatatype_dnskey);
 		REQUIRE(rdata.length > 3);
+
+		/* Skip unsupported algorithms when
+		 * calculating the maximum iterations.
+		 */
 		if (!dst_algorithm_supported(rdata.data[3]))
 			continue;