auth: Also allow generic record format in zone parsing for pdnsutil zonemd-verify...

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index fedee5d985582e02abc52226253a51726492afff..6e7066b784a06c1166ee46da9a6daf58846d99b8 100644 (file)
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -1363,7 +1363,7 @@ static int xcryptIP(const std::string& cmd, const std::string& ip, const std::st
 #endif /* HAVE_IPCIPHER */
 
 static int zonemdVerifyFile(const DNSName& zone, const string& fname) {
-  ZoneParserTNG zpt(fname, zone);
+  ZoneParserTNG zpt(fname, zone, "", true);
   zpt.setMaxGenerateSteps(::arg().asNum("max-generate-steps"));
 
   bool validationDone, validationOK;

diff --git a/regression-tests.nobackend/zonemd-test-cases/zones/20-generic-zonemd/example.zone b/regression-tests.nobackend/zonemd-test-cases/zones/20-generic-zonemd/example.zone
index 8d9c261f5706e4a3ca1d2d589cff469a376f4d64..554e99feccd17f4a1e043bc4e9321ba7eb7e2409 100644 (file)
--- a/regression-tests.nobackend/zonemd-test-cases/zones/20-generic-zonemd/example.zone
+++ b/regression-tests.nobackend/zonemd-test-cases/zones/20-generic-zonemd/example.zone
@@ -1,4 +1,4 @@
 example.       86400   IN      NS      ns.example.
 example.       86400   IN      SOA     ns.example. admin.example. 2018031900 1800 900 604800 86400
-example.       86400   IN      ZONEMD  2018031900 1 1 8ee54f64ce0d57fd70e1a4811a9ca9e849e2e50cb598edf3ba9c2a58625335c1f966835f0d4338d9f78f557227d63bf6
+example.       86400   IN      TYPE63  \# 54 7848b91c01018ee54f64ce0d57fd70e1a4811a9ca9e849e2e50cb598edf3ba9c2a58625335c1f966835f0d4338d9f78f557227d63bf6
 ns.example.    3600    IN      A       127.0.0.1

diff --git a/regression-tests.nobackend/zonemd-test-cases/zones/45-root-zone/root.zone.hashed b/regression-tests.nobackend/zonemd-test-cases/zones/45-root-zone/root.zone.hashed
index 6b3b04a72714a92dc5954083bac8af460aeffba2..6ccca4215601b38ceebe63ff96f2db58790a19eb 100644 (file)
--- a/regression-tests.nobackend/zonemd-test-cases/zones/45-root-zone/root.zone.hashed
+++ b/regression-tests.nobackend/zonemd-test-cases/zones/45-root-zone/root.zone.hashed
@@ -20,7 +20,7 @@
 .      86400   IN      NSEC    aaa. NS SOA RRSIG NSEC DNSKEY TYPE63 
 .      86400   IN      DNSKEY  256 3 8 AwEAAZTGv2wmrvnhZ1f4Adpwhz6Z0BbbmlCBf/MN58G2nF82w5vZZ7I0QSkKKk4CGCclh+SeGg6QBvKpizswrJvm5egaFiUQFzvIUvBmCm0oWCIYmu7ewsjGmIqgwlUvGL9xPPE3PQs5s++ZazVtUb+5xsxHS/qp2NT+bp0C5tRnWr7fNc1TFQgXFM69+jNKxVGO/JQSN5xguoBdwCelWEQcllAzCvNKRkilnDMDSXipiPzqTcM/DnSifRskaDLY9cy82044MA4eEfI2DumLfRDXI8IuJLbhYA9Enl044RIeBRRoDyR+ipx9yd6nizGzme2+ze3H9tRVAMbB9z5S+zcjmHU= ;{id = 17913 (zsk), size = 2048b}
 .      86400   IN      DNSKEY  257 3 8 AwEAAbP1gbbCHbgEmVs/RAhiW6ohuVICDnOEEZ7U4DcFctfjbWFG+Wuh8KQe6ukgKALFy129NfPa7e0IjMQRQ3DN3DqQqV0cLRx1ESfug2R8ya3JIsBVR6SAkX/+x55/g27lMTtc5zhGBCAQvZip0LpnDYU3F+IvC+GR065Wn25GjspN0xjSqr37ch0qOwXCMNLY6rBkHkUylajDg9g8s1SBq0gkCWXd7ZJjX5gHn1VjCh3W6amUCAJ3B/qEiEYUjwLAQa1S+XQzxLTExE3UJjgzs/El0Y0IUOO/X/hzZHwU1AiH4/nSAfBVfOY6kAUQk9xrm5Pb+h4DL45kzd6vRyhLobs= ;{id = 21544 (ksk), size = 2048b}
-.      86400   IN      ZONEMD  2021051901 1 1 ce4da51b3dd9166e24cbedd141aee69279389402a132b555a5419ecdca473579f3f5bb2f7671e454db6ac42aa96a4d70
+.      86400   IN      TYPE63  \# 54 7876cdfd0101ce4da51b3dd9166e24cbedd141aee69279389402a132b555a5419ecdca473579f3f5bb2f7671e454db6ac42aa96a4d70
 aaa.   172800  IN      NS      ns1.dns.nic.aaa.
 aaa.   172800  IN      NS      ns2.dns.nic.aaa.
 aaa.   172800  IN      NS      ns3.dns.nic.aaa.

diff --git a/regression-tests.nobackend/zonemd-test-cases/zones/50-uppercase-nsec-rdata-names/arpa.zone.hashed b/regression-tests.nobackend/zonemd-test-cases/zones/50-uppercase-nsec-rdata-names/arpa.zone.hashed
index 9464b298a7090daec2dcbc84d45e192abed92012..7d925f92c9a69aee23d7eaf973c8c0debc4989fc 100644 (file)
--- a/regression-tests.nobackend/zonemd-test-cases/zones/50-uppercase-nsec-rdata-names/arpa.zone.hashed
+++ b/regression-tests.nobackend/zonemd-test-cases/zones/50-uppercase-nsec-rdata-names/arpa.zone.hashed
@@ -19,7 +19,7 @@ arpa. 86400   IN      RRSIG   TYPE63 8 1 86400 20210727155612 20210629155612 29094 arpa.
 arpa.  86400   IN      NSEC    AS112.ARPA. NS SOA RRSIG NSEC DNSKEY TYPE63 
 arpa.  86400   IN      DNSKEY  256 3 8 AwEAAdMaRW2okM0GrfInisiH9HWsqokdnmeXnJjKUwVQ8dy5sxm0DyCtzNapj54SF4ofgJxYufQCzYoe3Y3WsB6dKW15pTvu6ggqwuTTxvAnkMSHAlMGBE0sybRBIM38WswPcjAXmpITj7Zvgm8qh80dcusK5vwqJhb2CDWHRezUwiIB ;{id = 29094 (zsk), size = 1024b}
 arpa.  86400   IN      DNSKEY  257 3 8 AwEAAdQP1t2ookuQYFNUNGDmLHcoA6LFSImvULaUgChKiIO6Vv5yDyHB0Ng6ZkfHM0586cLcbXNBLj/9u5A4vqzOFj8phzW4WLZREZBLYMcuHhvQdqzuDJ0J5mxmLLis5eNaCwukVm6Zpf/otzCJsx9LyrhQBTyx6FF+h7dbSCvjh7tD ;{id = 18949 (ksk), size = 1024b}
-arpa.  86400   IN      ZONEMD  2021062901 1 1 578c4c70a9b75af08eb159293188cf6659db2339cfed605e2272f23465d4f1d733c07263860ad66725ee53cbc5f69fc3
+arpa.  86400   IN      TYPE63  \# 54 7876f8f50101578c4c70a9b75af08eb159293188cf6659db2339cfed605e2272f23465d4f1d733c07263860ad66725ee53cbc5f69fc3
 as112.arpa.    172800  IN      NS      a.iana-servers.net.
 as112.arpa.    172800  IN      NS      b.iana-servers.net.
 as112.arpa.    172800  IN      NS      c.iana-servers.net.

diff --git a/regression-tests.nobackend/zonemd-test-cases/zones/51-uppercase-nsec3-rdata-names/arpa.zone.hashed b/regression-tests.nobackend/zonemd-test-cases/zones/51-uppercase-nsec3-rdata-names/arpa.zone.hashed
index 325c06eee7c7bb3b530b48cf6325a6a35ed8215f..6a10fe9c494231c980dfc5b167637da66a1f823d 100644 (file)
--- a/regression-tests.nobackend/zonemd-test-cases/zones/51-uppercase-nsec3-rdata-names/arpa.zone.hashed
+++ b/regression-tests.nobackend/zonemd-test-cases/zones/51-uppercase-nsec3-rdata-names/arpa.zone.hashed
@@ -19,7 +19,7 @@ arpa. 86400   IN      RRSIG   TYPE63 8 1 86400 20210616170429 20210519170429 29094 arpa.
 arpa.  86400   IN      DNSKEY  256 3 8 AwEAAdMaRW2okM0GrfInisiH9HWsqokdnmeXnJjKUwVQ8dy5sxm0DyCtzNapj54SF4ofgJxYufQCzYoe3Y3WsB6dKW15pTvu6ggqwuTTxvAnkMSHAlMGBE0sybRBIM38WswPcjAXmpITj7Zvgm8qh80dcusK5vwqJhb2CDWHRezUwiIB ;{id = 29094 (zsk), size = 1024b}
 arpa.  86400   IN      DNSKEY  257 3 8 AwEAAdQP1t2ookuQYFNUNGDmLHcoA6LFSImvULaUgChKiIO6Vv5yDyHB0Ng6ZkfHM0586cLcbXNBLj/9u5A4vqzOFj8phzW4WLZREZBLYMcuHhvQdqzuDJ0J5mxmLLis5eNaCwukVm6Zpf/otzCJsx9LyrhQBTyx6FF+h7dbSCvjh7tD ;{id = 18949 (ksk), size = 1024b}
 arpa.  3600    IN      NSEC3PARAM      1 0 1 - 
-arpa.  86400   IN      ZONEMD  2021051902 1 1 9a84145013e13e3de2328868888c65aa46b7381213990f83d496c642d2324029cc852e09bffa38afd8e9197977776591
+arpa.  86400   IN      TYPE63  \# 54 7876cdfe01019a84145013e13e3de2328868888c65aa46b7381213990f83d496c642d2324029cc852e09bffa38afd8e9197977776591
 0js82oec35lbbc4hl35476cm5icacksf.arpa. 86400   IN      RRSIG   NSEC3 8 2 86400 20210616170429 20210519170429 29094 arpa. PRVkH4+Nm17QlFgwFLnoqwaiIwWZ4pvscanHdMb6HOKkSxwtDoWAGhZubvYGt/Je735nQkGQPPXW2tkMkJa3D7e6RkX/8AoxcqqXOimC6BlG6LuSL4rSousDlbrulyh87qgIHXkUtrHyYUNAMZMKOjMHo7t5IxwjBO0SGADoglk=
 0js82oec35lbbc4hl35476cm5icacksf.arpa. 86400 IN NSEC3 1 0 1 - 2UB8EN7BK0T6DENIGO3I729IVQVME3VE NS
 2ub8en7bk0t6denigo3i729ivqvme3ve.arpa. 86400   IN      RRSIG   NSEC3 8 2 86400 20210616170429 20210519170429 29094 arpa. JsSiqDiPs0juQxKEcCKTFvKXzUdvIvCILEzcN79+qAxaiQuulHUxTSMDvrsxm83m9juvoOUYtBlPyZdI9erAfiEkpF71ZIl8iP7AKGgqTeV1C4SHnf2KsFi69qimdLbWeIfFGYEq+54Vj5vF1SrRounvj63avhI/Zf0tTWz11+4=

diff --git a/regression-tests.nobackend/zonemd-test-cases/zones/52-uppercase-rrsig-rdata-names/arpa.zone.hashed b/regression-tests.nobackend/zonemd-test-cases/zones/52-uppercase-rrsig-rdata-names/arpa.zone.hashed
index c417f8617eeae7d842544f7a98d8904c13a72aed..61c8c15f7e21d77b21b0020c42efb40f8c191f19 100644 (file)
--- a/regression-tests.nobackend/zonemd-test-cases/zones/52-uppercase-rrsig-rdata-names/arpa.zone.hashed
+++ b/regression-tests.nobackend/zonemd-test-cases/zones/52-uppercase-rrsig-rdata-names/arpa.zone.hashed
@@ -19,7 +19,7 @@ arpa. 86400 IN RRSIG TYPE63 8 1 86400 20210616170629 20210519170629 29094 ARPA.
 arpa.  86400   IN      NSEC    as112.arpa. NS SOA RRSIG NSEC DNSKEY TYPE63 
 arpa.  86400   IN      DNSKEY  256 3 8 AwEAAdMaRW2okM0GrfInisiH9HWsqokdnmeXnJjKUwVQ8dy5sxm0DyCtzNapj54SF4ofgJxYufQCzYoe3Y3WsB6dKW15pTvu6ggqwuTTxvAnkMSHAlMGBE0sybRBIM38WswPcjAXmpITj7Zvgm8qh80dcusK5vwqJhb2CDWHRezUwiIB ;{id = 29094 (zsk), size = 1024b}
 arpa.  86400   IN      DNSKEY  257 3 8 AwEAAdQP1t2ookuQYFNUNGDmLHcoA6LFSImvULaUgChKiIO6Vv5yDyHB0Ng6ZkfHM0586cLcbXNBLj/9u5A4vqzOFj8phzW4WLZREZBLYMcuHhvQdqzuDJ0J5mxmLLis5eNaCwukVm6Zpf/otzCJsx9LyrhQBTyx6FF+h7dbSCvjh7tD ;{id = 18949 (ksk), size = 1024b}
-arpa.  86400   IN      ZONEMD  2021051902 1 1 db114bb13809ed81b8fa94f3024996b646b2762805676b0f6a5569b96196f1307d7a9cde68c4eea614a15c59c2332532
+arpa.  86400   IN      TYPE63  \# 54 7876cdfe0101db114bb13809ed81b8fa94f3024996b646b2762805676b0f6a5569b96196f1307d7a9cde68c4eea614a15c59c2332532
 as112.arpa.    172800  IN      NS      a.iana-servers.net.
 as112.arpa.    172800  IN      NS      b.iana-servers.net.
 as112.arpa.    172800  IN      NS      c.iana-servers.net.