]> git.ipfire.org Git - thirdparty/knot-dns.git/commitdiff
projects / thirdparty / knot-dns.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9283122)
semcheck: align NSEC3 TTL check to new requirements
authorLibor Peltan <libor.peltan@nic.cz>
Thu, 4 Feb 2021 11:16:15 +0000 (12:16 +0100)
committerLibor Peltan <libor.peltan@nic.cz>
Fri, 5 Feb 2021 11:14:25 +0000 (12:14 +0100)
see also !1219

src/knot/zone/semantic-check.c patch | blob | blame | history
tests/knot/semantic_check_data/dname_apex_nsec3.signed patch | blob | blame | history
tests/knot/semantic_check_data/no_error_nsec3_delegation.signed patch | blob | blame | history
tests/knot/semantic_check_data/no_error_nsec3_optout.signed patch | blob | blame | history
tests/knot/semantic_check_data/nsec3_ds.signed patch | blob | blame | history

diff --git a/src/knot/zone/semantic-check.c b/src/knot/zone/semantic-check.c
index fa0383fafe0a5cdb474d494dd2dbe82612859f9d..3f48b2b007803a55bbb5e07dd7a6df7b7919d8e9 100644 (file)
--- a/src/knot/zone/semantic-check.c
+++ b/src/knot/zone/semantic-check.c
@@ -934,10 +934,10 @@ static int check_nsec3(const zone_node_t *node, semchecks_data_t *data)
                goto nsec3_cleanup;
        }
 
-       const knot_rdataset_t *soa_rrs = node_rdataset(data->zone->apex, KNOT_RRTYPE_SOA);
-       assert(soa_rrs);
-       uint32_t minimum_ttl = knot_soa_minimum(soa_rrs->rdata);
-       if (nsec3_rrs.ttl != minimum_ttl) {
+       knot_rrset_t soa_rrset = node_rrset(data->zone->apex, KNOT_RRTYPE_SOA);
+       assert(!knot_rrset_empty(&soa_rrset));
+       uint32_t minimum_ttl = knot_soa_minimum(soa_rrset.rrs.rdata);
+       if (nsec3_rrs.ttl != MIN(minimum_ttl, soa_rrset.ttl)) {
                data->handler->cb(data->handler, data->zone, node,
                                  SEM_ERR_NSEC3_RDATA_TTL, info);
        }
diff --git a/tests/knot/semantic_check_data/dname_apex_nsec3.signed b/tests/knot/semantic_check_data/dname_apex_nsec3.signed
index 287fe35a8fbb916deddedc0048ba452fcb6af238..b083ce99e21a7df4e780bd39d35db9186ea41e21 100644 (file)
--- a/tests/knot/semantic_check_data/dname_apex_nsec3.signed
+++ b/tests/knot/semantic_check_data/dname_apex_nsec3.signed
@@ -1,23 +1,25 @@
+; Zone without any semantic error
+
 ;; Zone dump (Knot DNS 2.6.0)
-example.com.           3600    SOA     dns1.com. hostmaster.com. 2010111216 21600 3600 604800 86400
+example.com.           3600    SOA     dns1.com. hostmaster.com. 2010111217 21600 3600 604800 86400
 example.com.           3600    NS      dns1.com.
 example.com.           3600    DNAME   bar.example.com.
-example.com.           0       CDNSKEY 257 3 13 p3J5T0YFTf9IGjHFhS5oFGGBDOjs25Tz29eT5sAK7WxXoapa4Vw3C9zBH/BdDH1RmeUR6OHPY1+x2NiouNm05g==
-example.com.           0       CDS     2073 13 2 B345AF792A41656301EC57A4CE7E03C02A5E3C8F422FAB2FCD67C25649DB1285
-example.com.           3600    DNSKEY  256 3 13 UthmrB0FXNo/yZ3N0cnG/OJxG0FR7CT6KadbK4n22rMzfwq87jnobJ0xOpC7aEpGgDbypR0rK+KIAbRv4Prfeg==
-example.com.           3600    DNSKEY  257 3 13 p3J5T0YFTf9IGjHFhS5oFGGBDOjs25Tz29eT5sAK7WxXoapa4Vw3C9zBH/BdDH1RmeUR6OHPY1+x2NiouNm05g==
-example.com.           0       NSEC3PARAM      1 0 10 90E4D95759B9FB50
+example.com.           0       CDNSKEY 257 3 13 Yk8KOmyVzOij3x+Zs+eT4J2Up9+ipwXEKOhL9fTYY/DU10yIQt+zYm02UFZJX2oVTdHBCajpBFsZLH2X4ho1yw==
+example.com.           0       CDS     25674 13 2 2EC05563A3537BD32EA3EB92C44794C644F249EE440785CF28207B903E35322D
+example.com.           3600    DNSKEY  256 3 13 tCoteOM+A4o/A9uxgLyDg3HOg2DClU+3d+1XPQRtTfuaEFOGIpyH6qiFUv2b4DYuvmMyTkL99nxvyhA8yo0Cgg==
+example.com.           3600    DNSKEY  257 3 13 Yk8KOmyVzOij3x+Zs+eT4J2Up9+ipwXEKOhL9fTYY/DU10yIQt+zYm02UFZJX2oVTdHBCajpBFsZLH2X4ho1yw==
+example.com.           0       NSEC3PARAM      1 0 10 151E9F1094FE188F
 ;; DNSSEC signatures
-example.com.           3600    RRSIG   NS 13 2 3600 20670924135857 20171006122857 46856 example.com. I2YeGSYvj56eHe7bkbnOpziu18gAdwMGEH5ZAGiuZzL37M2lRB/2rtAxWpxP1G1+idFXahAx6q2X5pK1o/yZWQ==
-example.com.           3600    RRSIG   SOA 13 2 3600 20670924135857 20171006122857 46856 example.com. NULugLRW6r+y6AAJS2tcFt5BBWJMMxq3q0wvYirSvzzt5A6vwWC2ocJ2A2kftoDrIQWYHl1ppsxHTMsvw3NKfQ==
-example.com.           3600    RRSIG   DNAME 13 2 3600 20670924135857 20171006122857 46856 example.com. PhUAnuLYFE3ySc9mMoExr+WoGf6it4/571GhjYyhgfUWQs1pE8WJismYG9NFle6Q3OlmDJSEWQwHBHxQmOeyKw==
-example.com.           3600    RRSIG   DNSKEY 13 2 3600 20670924135857 20171006122857 2073 example.com. ZnhiPDiX/3RUW5rdLO8pKcIe+orbYloDD1mxhmfvfJ52IGdCV+okDu2M559pUB8Ihb/6H9DDl1qO5lTVGpVEMg==
-example.com.           0       RRSIG   NSEC3PARAM 13 2 0 20670924135857 20171006122857 46856 example.com. DxyzDQGkONU+NTxBswKZRWc3kPQxH929PaD5S4g6MoH6EJ/X52mb5om0oXpXLuOTEo2Cij8c3aghLN2h3eiw5Q==
-example.com.           0       RRSIG   CDS 13 2 0 20670924135857 20171006122857 46856 example.com. 8tPTolSZPvZUSpIs+nb4x/QRrNFgZG0jqqWWnQH8zy3CRS4L91SU5Z08aVz632n35toWv+uqG8LXI0sLKm6M4g==
-example.com.           0       RRSIG   CDNSKEY 13 2 0 20670924135857 20171006122857 46856 example.com. 80MTgMHXqc8Eb+3LPjl9fJ6sjNR40MPVKUfD/Qw0mzWHjz8ZOUDxNZViHnmyoz4JoorrO5b2yAx+ojpt+FyQLg==
+example.com.           3600    RRSIG   NS 13 2 3600 20400406111136 20210205094136 61806 example.com. WIlxYlV/hn9mfojITrVbIV+Giy9b5pAKofkw62Yli+jIspQ3dC/WWLrM5Y4HcQwTfNp7yuhIS0jPzkuy0xuAxg==
+example.com.           3600    RRSIG   SOA 13 2 3600 20400406111136 20210205094136 61806 example.com. z71ipK0zBRKKokzXdoZdtkxGC75MJbwmICNjSfd+IX/hneIGvFE7mTose1Zbb0WGgKRdUMEoii7hLZLrx7waqg==
+example.com.           3600    RRSIG   DNAME 13 2 3600 20400406111136 20210205094136 61806 example.com. 5tIYeBwbwpVF0X5ZLoSpHeB8IYLU5/2fFYXqvctZYqTO24T0EBfu+++j66VSERAI38xf2Z0KkYcwx1XeIeivBQ==
+example.com.           3600    RRSIG   DNSKEY 13 2 3600 20400406111136 20210205094136 25674 example.com. X3n5YVkjpSpK+IOCkhv/wFmF5WIPHUR2LXkNME84i5S4efvQiRRq/jgqos2f7OgfSi/9Q2Q2x6BiMQ1vx/R+Pw==
+example.com.           0       RRSIG   NSEC3PARAM 13 2 0 20400406111136 20210205094136 61806 example.com. gogp8pZycFopDodl4IOfpaKCbLqXw2v+5DcV2YwmHr/pMwrc28bClQxw4HVGcYQ13HpC9kKmzmcrn3dEumTb3A==
+example.com.           0       RRSIG   CDS 13 2 0 20400406111136 20210205094136 25674 example.com. zRQEFycg2sNVVB4TOZO8QcMwRwSA7tHJqkc1l9V+WtEdJY8UvYpYPPgAn9FjWMzzhvRMlws89TBSsQzqCemHiQ==
+example.com.           0       RRSIG   CDNSKEY 13 2 0 20400406111136 20210205094136 25674 example.com. hLOpPxmKXU//dmQoE5OdCqzWkkJsuBHa8QITWB/A3Tc2CXQTaqFKqTspZvTLOAYKNaSVu6BOLWM7Fi2Bq3I0mQ==
 ;; DNSSEC NSEC3 chain
-9sq7g935u0bb7md3rn34uh1aknnjhf1k.example.com. 86400    NSEC3   1 0 10 90E4D95759B9FB50 9SQ7G935U0BB7MD3RN34UH1AKNNJHF1K NS SOA DNAME RRSIG DNSKEY NSEC3PARAM CDS CDNSKEY
+ple28jlp3q5anh045ssk9f3u7ltd4qlc.example.com. 3600     NSEC3   1 1 10 151E9F1094FE188F ple28jlp3q5anh045ssk9f3u7ltd4qlc NS SOA DNAME RRSIG DNSKEY NSEC3PARAM CDS CDNSKEY
 ;; DNSSEC NSEC3 signatures
-9sq7g935u0bb7md3rn34uh1aknnjhf1k.example.com. 86400    RRSIG   NSEC3 13 3 86400 20670924135857 20171006122857 46856 example.com. sFlwNYgq6HoBDlXp9vC0Ck5uJ76rJyf4zfdQmTnJ8aB/44XvDoQ+tGIn4ilVN2SxzyT1A4c/nWOyMMCVhjXARg==
+ple28jlp3q5anh045ssk9f3u7ltd4qlc.example.com. 3600     RRSIG   NSEC3 13 3 3600 20400406111136 20210205094136 61806 example.com. C3JeKvcKdQO3zTJqg5Z114jTd36tgF7PIL2kCs7X6VnCaVe7E5NtwUuLMLFIw/gUqaLDbE7vQwHMK3Psl536aA==
 ;; Written 17 records
 ;; Time 2017-10-06 15:58:57 CEST
diff --git a/tests/knot/semantic_check_data/no_error_nsec3_delegation.signed b/tests/knot/semantic_check_data/no_error_nsec3_delegation.signed
index 86c330027242c109b5da34ce66dab04d6fb6c2a1..4c85a4b3ac72d4277225143f6bb58921928a5f90 100644 (file)
--- a/tests/knot/semantic_check_data/no_error_nsec3_delegation.signed
+++ b/tests/knot/semantic_check_data/no_error_nsec3_delegation.signed
@@ -7,67 +7,37 @@ example.com.          3600    IN SOA  dns1.example.com. hostmaster.example.com. (
                                        604800     ; expire (1 week)
                                        86400      ; minimum (1 day)
                                        )
-                       3600    RRSIG   SOA 13 2 3600 (
-                                       20601231235959 20201008173641 61552 example.com.
-                                       E7WaHxspFd9oLMw+olrSJ3vmjJvFTVvycLZK
-                                       vP/u22jSBPzXzJA6+j5jL6wYQqNkiByBvn/V
-                                       cfgTEzpm5WCw+Q== )
                        3600    NS      dns1.example.com.
-                       3600    RRSIG   NS 13 2 3600 (
-                                       20601231235959 20201008173641 61552 example.com.
-                                       ZVRKA8Dbs8tijcRN/bffIspeKxYOsQLwUaa/
-                                       Q3XQ0jxbc33bTixwV6xs2KnKNKnVqUZnXrLy
-                                       VrnmgXrZwdWlng== )
-                       3600    DNSKEY  256 3 13 (
-                                       ZSeDf0EC0JPTMCCt7Q6PRXUwBJ/nSlad9A6v
-                                       977MybwCcQ8zN79P0gPFIxlhJJdzNqhgjFlf
-                                       vivXOUDulSSI9A==
-                                       ) ; ZSK; alg = ECDSAP256SHA256 ; key id = 61552
-                       3600    DNSKEY  257 3 13 (
-                                       /QdSjuxZryoyD7klTN88pnMRdHr3kJoJV5y+
-                                       W/a0T+3BAOrcr5K+ruLumK7h22EU/lvqGzkH
-                                       qwbNQou89M96cw==
-                                       ) ; KSK; alg = ECDSAP256SHA256 ; key id = 42777
-                       3600    RRSIG   DNSKEY 13 2 3600 (
-                                       20601231235959 20201008173641 42777 example.com.
-                                       g/MtgDB9/NQo4u6IhIITpgVATHc6TSgkAw2G
-                                       ts/usjOM/QSgpHQ8eLxn94krqln5BoPXexeg
-                                       BEWzg1yy+hKKFA== )
                        0       NSEC3PARAM 1 0 10 -
-                       0       RRSIG   NSEC3PARAM 13 2 0 (
-                                       20601231235959 20201008173641 61552 example.com.
-                                       7dziD/TwhhSCFcjG0XcxB8FJuz8g94pjzRWM
-                                       WTN+ZSrhm8LICEmZV1PeQwu77w5WpGWE5DI5
-                                       ea078nTwL2hR7Q== )
-deleg.example.com.     3600    IN NS   deleg.example.com.
-                       3600    A       192.0.2.1
-dns1.example.com.      3600    IN A    192.0.2.1
+
+example.com. 3600 DNSKEY 257 3 13 Yk8KOmyVzOij3x+Zs+eT4J2Up9+ipwXEKOhL9fTYY/DU10yIQt+zYm02UFZJX2oVTdHBCajpBFsZLH2X4ho1yw==
+example.com. 3600 DNSKEY 256 3 13 tCoteOM+A4o/A9uxgLyDg3HOg2DClU+3d+1XPQRtTfuaEFOGIpyH6qiFUv2b4DYuvmMyTkL99nxvyhA8yo0Cgg==
+example.com.           3600    RRSIG   DNSKEY 13 2 3600 20400406103150 20210205090150 25674 example.com. 4tMK6g2B0ITXf2haSSuH45nO53GlpZQ97ofC5Pd/S38oeNzWmhfxIBaGtb597qxRA2NC7rYtGsscLrCa0sthMA==
+example.com.           3600    RRSIG   NS 13 2 3600 20400406102301 20210205085301 61806 example.com. TrCJZgu1hVoUK532mmhQpZcEcPdw4FezPCymtUuQH9XjZNBn3DP/OhM8NvAbtailiOIX/djosTC2cNDlqSoVCQ==
+example.com.           3600    RRSIG   SOA 13 2 3600 20400406102301 20210205085301 61806 example.com. h/+XG/WWQsoAuzOM2wiulY8TOslYTj4MyP7Rjj3VXx8frlheIN84yH7NL6Xgt3ibQJpJl7rujkDuoTBH+snnCw==
+example.com.           0       RRSIG   NSEC3PARAM 13 2 0 20400406102301 20210205085301 61806 example.com. TYk9hqD6hWA8YH/G3VeggrUHb7CwX3ut5GGiAOcl9o8I0gdMIOu8E1uUukexvJsZAt1Fbcjc7ZIbsUmvgs2MVg==
+deleg.example.com.     3600    RRSIG   NS 13 3 3600 20400406102301 20210205085301 61806 example.com. /Xg/3viyTMyd88hcByGifSMHGo3up83exBQQt4FC6qexZffRyNiLrHOfnoz/2LqFMg/oDVCsvqaEomiMM6FlZw==
+dns1.example.com.      3600    RRSIG   A 13 3 3600 20400406102301 20210205085301 61806 example.com. zc6VOVGfgoB9C8/0WPHOVrdikBzK6xh25UtrdIYuSzcPWbFlWSsV3+xS1q20MBDb2dj635jcyBWRep+287rDLA==
+deleg.example.com.     3600    RRSIG   A 13 3 3600 20400406103429 20210205090429 61806 example.com. 8hcIsHOARI1XXMcPXwtlmQC071+FBH+I0a6CufDbE7nPa38brBKomqTjiYF26K1KZ4IQASw5vvF0lFg3eEOZog==
+
+deleg.example.com.     3600    NS      deleg.example.com.
+deleg.example.com.     3600    A       192.0.2.1
+dns1.example.com.      3600    A       192.0.2.1
                        3600    RRSIG   A 13 3 3600 (
                                        20601231235959 20201008173641 61552 example.com.
                                        URGzLYXySdeOtXWW5ph64pNedd7/cq0WYcbd
                                        nArHBIN2S08knOfV/OHOMDaR7WufUbIF8bPQ
                                        FxDkURlAhZbH9A== )
-20G1GOL477RO51RK9A9NFD54TFQAL7IQ.example.com. 86400 IN NSEC3 1 0 10 - (
+20G1GOL477RO51RK9A9NFD54TFQAL7IQ.example.com. 3600 IN NSEC3 1 0 10 - (
                                        MJV836RJQEJ5UBGHVKSQ7N44RSO3Q938
                                        A RRSIG )
-                       86400   RRSIG   NSEC3 13 3 86400 (
-                                       20601231235959 20201008173641 61552 example.com.
-                                       Gsq0CIrN0FlxLeKvuUDc+8RqSQtnQxzx80Pe
-                                       eoyDaFw1tbe6Q7YEAM2GxxHqTEHrT3oel0sY
-                                       Tv+VlMmKkvXjBQ== )
-MJV836RJQEJ5UBGHVKSQ7N44RSO3Q938.example.com. 86400 IN NSEC3 1 0 10 - (
+MJV836RJQEJ5UBGHVKSQ7N44RSO3Q938.example.com. 3600 IN NSEC3 1 0 10 - (
                                        UTQVUHU2BLK3DHMRR5T1HD9VTEOHQT0A
-                                       NS )
-                       86400   RRSIG   NSEC3 13 3 86400 (
-                                       20601231235959 20201008173641 61552 example.com.
-                                       EoUde8+mJp+ZehVCZmwzm3FJqJ6A/FU3C4xE
-                                       kY/v1Rv04o+U1lP7OEb/IEKXwiJp6lRtNV+4
-                                       5IoHIj2SS3VVFw== )
-UTQVUHU2BLK3DHMRR5T1HD9VTEOHQT0A.example.com. 86400 IN NSEC3 1 0 10 - (
+                                       NS RRSIG )
+UTQVUHU2BLK3DHMRR5T1HD9VTEOHQT0A.example.com. 3600 IN NSEC3 1 0 10 - (
                                        20G1GOL477RO51RK9A9NFD54TFQAL7IQ
                                        NS SOA RRSIG DNSKEY NSEC3PARAM )
-                       86400   RRSIG   NSEC3 13 3 86400 (
-                                       20601231235959 20201008173641 61552 example.com.
-                                       7Oi01mTqe1ZmshYh8fY5xjB29wn3ZIUWQlk5
-                                       vpxY6ExbIPS9hxEW+E7ZqIkIe+G24dN0uxUv
-                                       Ru9+TF8J0FmliA== )
+
+20g1gol477ro51rk9a9nfd54tfqal7iq.example.com. 3600     RRSIG   NSEC3 13 3 3600 20400406102301 20210205085301 61806 example.com. LUBULY9667EsrOHecNjp2QkW9JJW1fOSyTmleWul7vGFwuNC1mKVUQu3H3V5ndtwzU1YD69oa6eI2DOERmiJXg==
+mjv836rjqej5ubghvksq7n44rso3q938.example.com. 3600     RRSIG   NSEC3 13 3 3600 20400406105733 20210205092733 61806 example.com. zYuSttG565eDv3FPeKfZs4FNuJHD204/8nv8cNx+9iqbxMdh5s1XJx4nolWyiOJcBq+G8CmtiuJK6plUs7x67w==
+utqvuhu2blk3dhmrr5t1hd9vteohqt0a.example.com. 3600     RRSIG   NSEC3 13 3 3600 20400406102301 20210205085301 61806 example.com. aMivM0YOs4Il/WRWqf3SRzh21nZXau7VIJOpX2NK46qxBCW41N/+J7rXaeAT15ayWNjCHP1YoDwyuC/lVZtCqg==
diff --git a/tests/knot/semantic_check_data/no_error_nsec3_optout.signed b/tests/knot/semantic_check_data/no_error_nsec3_optout.signed
index 162d8bb450d8360f93d28cbc56ee17c4896f2bd0..a03f4eae8beaa230116079904ec5ed43700e4656 100644 (file)
--- a/tests/knot/semantic_check_data/no_error_nsec3_optout.signed
+++ b/tests/knot/semantic_check_data/no_error_nsec3_optout.signed
@@ -1,73 +1,29 @@
 ; Zone without any semantic error
 
-example.com.           3600    IN SOA  dns1.example.com. hostmaster.example.com. (
-                                       2010111221 ; serial
-                                       21600      ; refresh (6 hours)
-                                       3600       ; retry (1 hour)
-                                       604800     ; expire (1 week)
-                                       86400      ; minimum (1 day)
-                                       )
-                       3600    RRSIG   SOA 13 2 3600 (
-                                       20601231235959 20201008173847 50991 example.com.
-                                       Sx+KLjF5CXA72DpzNAPGTnvxgVkYnFTby5iB
-                                       s9W3jKGzAulrULc1vQT+3qlwcn5QEbSF5hgn
-                                       1END5XSBda09+w== )
-                       3600    NS      dns1.example.com.
-                       3600    RRSIG   NS 13 2 3600 (
-                                       20601231235959 20201008173847 50991 example.com.
-                                       zVKNLQD7rZGMyvDgve6owlzFJMSlYl5ipNQK
-                                       csRD1zxDFuHleXvQCm8FIUycDNfMWhHNc2s9
-                                       4egmySesIYU0uQ== )
-                       3600    DNSKEY  256 3 13 (
-                                       fsusYo6WwsvIRG0sUChUxT/+OVjbsIstAUKt
-                                       9K1XUJhVohQ5vcl+ouVNHI3Y2qS/QG+GUydo
-                                       3V07g6mj8RkXUQ==
-                                       ) ; ZSK; alg = ECDSAP256SHA256 ; key id = 50991
-                       3600    DNSKEY  257 3 13 (
-                                       MGFyaDr1XwpvtG9aI0YQqTb04vq4OdlQmshL
-                                       pevx+/Zyyy/ObA1+5TaxiMMW/awpr+Oe+BCU
-                                       nlO/vkwdE+Y5TA==
-                                       ) ; KSK; alg = ECDSAP256SHA256 ; key id = 13472
-                       3600    RRSIG   DNSKEY 13 2 3600 (
-                                       20601231235959 20201008173847 13472 example.com.
-                                       WrFYEyOsZRdS3dycDhEO2taiDWExHP6u9B82
-                                       vsEuKPReSdRo9J7rh73/7lLJnCy3s2nIF/3w
-                                       JI+YSujbCi6hLA== )
-                       0       NSEC3PARAM 1 0 10 7A148F1404032E16
-                       0       RRSIG   NSEC3PARAM 13 2 0 (
-                                       20601231235959 20201008173847 50991 example.com.
-                                       sqHv1vGfOvCrJZAModjKOQdggsI+q1554oWk
-                                       8uP8aDNcqMIFsJNYnAaKw+tUwQ3a3qwNrtnB
-                                       oJwKCvEdodfzew== )
-deleg.example.com.     3600    IN NS   deleg.example.com.
-                       3600    A       192.0.2.1
-dns1.example.com.      3600    IN A    192.0.2.1
-                       3600    RRSIG   A 13 3 3600 (
-                                       20601231235959 20201008173847 50991 example.com.
-                                       BHxNoR/8eDuOf0uro0FhAr32lvLPXVHYtkJk
-                                       hLytkaJE8TeZrbmvQqOZPQFvpd+bKXEVfaPX
-                                       BNghbFskO8wlUw== )
-bgv0lkamjsoec22arugdnlttcb70af7u.example.com. 86400 IN NSEC3 1 0 10 7A148F1404032E16 (
-                                       S57MPBJ9OEOU9OH6HSV2ANMCV8BHLRMR
-                                       NS SOA RRSIG DNSKEY NSEC3PARAM )
-                       86400   RRSIG   NSEC3 13 3 86400 (
-                                       20601231235959 20201008173847 50991 example.com.
-                                       154MoFdP2smx09KBMiy36uNh+I7FVcwqUkHv
-                                       2Tq6CpJJvsZcTH0TBx2rwQ0UEARbVg1fsEZw
-                                       S3mCUat1VTbhVg== )
-036n766anb525cqa642tmm3r4occikb7.example.com. 86400 IN NSEC3 1 0 10 7A148F1404032E16 (
-                                       BGV0LKAMJSOEC22ARUGDNLTTCB70AF7U
-                                       A RRSIG )
-                       86400   RRSIG   NSEC3 13 3 86400 (
-                                       20601231235959 20201008173847 50991 example.com.
-                                       TS1jDhhKnv4QbWLzdvKbE0y4TduOJD8Tk+Ns
-                                       vvGv4x2cpNyqhbueaN2Uko+OAEmYQJYPfK/y
-                                       msRbeh57E0qsBQ== )
-s57mpbj9oeou9oh6hsv2anmcv8bhlrmr.example.com. 86400 IN NSEC3 1 0 10 7A148F1404032E16 (
-                                       036N766ANB525CQA642TMM3R4OCCIKB7
-                                       NS )
-                       86400   RRSIG   NSEC3 13 3 86400 (
-                                       20601231235959 20201008173847 50991 example.com.
-                                       0ET1wQ/5K9JEqb0U2moyZ2g3H5UVlORB3o83
-                                       brB22Sr/SKklbtWaixENYKli0m3j1RohtDeM
-                                       dSm0rS8vPG3FUA== )
+;; Zone dump (Knot DNS 3.1.dev.1612270066.d215637a6)
+example.com.           3600    SOA     dns1.example.com. hostmaster.example.com. 2010111222 21600 3600 604800 86400
+example.com.           3600    NS      dns1.example.com.
+example.com.           0       CDNSKEY 257 3 13 Yk8KOmyVzOij3x+Zs+eT4J2Up9+ipwXEKOhL9fTYY/DU10yIQt+zYm02UFZJX2oVTdHBCajpBFsZLH2X4ho1yw==
+example.com.           0       CDS     25674 13 2 2EC05563A3537BD32EA3EB92C44794C644F249EE440785CF28207B903E35322D
+example.com.           3600    DNSKEY  256 3 13 tCoteOM+A4o/A9uxgLyDg3HOg2DClU+3d+1XPQRtTfuaEFOGIpyH6qiFUv2b4DYuvmMyTkL99nxvyhA8yo0Cgg==
+example.com.           3600    DNSKEY  257 3 13 Yk8KOmyVzOij3x+Zs+eT4J2Up9+ipwXEKOhL9fTYY/DU10yIQt+zYm02UFZJX2oVTdHBCajpBFsZLH2X4ho1yw==
+example.com.           0       NSEC3PARAM      1 0 10 151E9F1094FE188F
+deleg.example.com.     3600    NS      deleg.example.com.
+deleg.example.com.     3600    A       192.0.2.1
+dns1.example.com.      3600    A       192.0.2.1
+;; DNSSEC signatures
+example.com.           3600    RRSIG   NS 13 2 3600 20400406110811 20210205093811 61806 example.com. VD3IclxLUSi1tgv4+FJ+9e3EWiRny6de1y4jUFn1Ama8+Cl2vZO2Jc34Q9MKY/S9m4id7Xe8MtkkrKThQcaaXw==
+example.com.           3600    RRSIG   SOA 13 2 3600 20400406110811 20210205093811 61806 example.com. BniH53lEM1hYGcorTmqF7At3+neZkifPT1sM15nGlQUQ6RfkPxh7Uy8Pj3PxLL5v7WDTyFGbLVThEFWZUh/h6w==
+example.com.           3600    RRSIG   DNSKEY 13 2 3600 20400406110811 20210205093811 25674 example.com. 3FSDEJ9f54++FX/EHWXXnbHW8iJPaDG4kc7qf772y62dtqTfAvb22lq2yKzCOaRFFwpPKEdcS4OEkhx0IbC27w==
+example.com.           0       RRSIG   NSEC3PARAM 13 2 0 20400406110811 20210205093811 61806 example.com. BTT+7Gj8V2pATxogxJ8xEO5eiVHoVIDxdK60zDS3MWNcbUc/n9vJR8NrCECel9egQUWrejawikO4DkyQxLZpkw==
+example.com.           0       RRSIG   CDS 13 2 0 20400406110811 20210205093811 25674 example.com. h43kZiM1EFETWQEtMM8Xls/RFDsAkLIpLf+DUnJ+zzxv37xpGvtf/s//3ew9qEhouBnGh/1FWtNr8vjhzh0tsg==
+example.com.           0       RRSIG   CDNSKEY 13 2 0 20400406110811 20210205093811 25674 example.com. 4mf7C/zyWoFRllUEaLHpdxJdlbEQXIRKNH6JOH3sTKSQMGj1SMmkWm9qlO9tVaUm1ggB6r8TPWgrAUBG+4A9gQ==
+dns1.example.com.      3600    RRSIG   A 13 3 3600 20400406110811 20210205093811 61806 example.com. lMj63MgZYiCl6Fdf0Q5C4/K99AAXTqCI9HSBQcrc7qiZDjRpZXzBUO8yv7+5JSMIo/A3tJtQL/12VFPGZ9NQ5w==
+;; DNSSEC NSEC3 chain
+ple28jlp3q5anh045ssk9f3u7ltd4qlc.example.com. 3600     NSEC3   1 1 10 151E9F1094FE188F rvcd9h11kcnenarqcmtmrhusdmb24rm4 NS SOA RRSIG DNSKEY NSEC3PARAM CDS CDNSKEY
+rvcd9h11kcnenarqcmtmrhusdmb24rm4.example.com. 3600     NSEC3   1 1 10 151E9F1094FE188F ple28jlp3q5anh045ssk9f3u7ltd4qlc A RRSIG
+;; DNSSEC NSEC3 signatures
+ple28jlp3q5anh045ssk9f3u7ltd4qlc.example.com. 3600     RRSIG   NSEC3 13 3 3600 20400406110811 20210205093811 61806 example.com. 7AdxaQLQ16ORwtf3t9lNQrzOP1BKu0TOIiKfx8/7o0JKoVtDYjqTC+ilWSD/Mbfb6PI6ND3NQKsIbnApOa2SUA==
+rvcd9h11kcnenarqcmtmrhusdmb24rm4.example.com. 3600     RRSIG   NSEC3 13 3 3600 20400406110811 20210205093811 61806 example.com. bOUzqzuIhV/SPyXiFOgsJbnS77dijFWcLDY/0X3r9aNiAo3/vSE4OTT0f6CkcBQDka+LjIoRaE7NIaTMl24fdg==
+;; Written 21 records
+;; Time 2021-02-05 12:08:11 CET
diff --git a/tests/knot/semantic_check_data/nsec3_ds.signed b/tests/knot/semantic_check_data/nsec3_ds.signed
index c2220ca3bdf4407b34c9d98b5da4b24ebe7aa152..ad5da7c1ceef04eaf6cb49203bb6b7a3b49e60a2 100644 (file)
--- a/tests/knot/semantic_check_data/nsec3_ds.signed
+++ b/tests/knot/semantic_check_data/nsec3_ds.signed
@@ -11,40 +11,23 @@ deleg.example.com.  3600    IN      RRSIG DS 7 3 3600 (
                                        uquQZT+z2HIdCE9HeslAkTlu/Xt78vF4+3db
                                        t2Vno21DkteA+w== )
 
-20G1GOL477RO51RK9A9NFD54TFQAL7IQ.example.com. 86400 IN NSEC3 1 0 10 - (
+20G1GOL477RO51RK9A9NFD54TFQAL7IQ.example.com. 3600 IN NSEC3 1 0 10 - (
                                        6DFJITU5VML86QNKU9FO2LJDDQQTQPVT 
                                        A RRSIG )
-6DFJITU5VML86QNKU9FO2LJDDQQTQPVT.example.com. 86400 IN NSEC3 1 1 10 - (
+6DFJITU5VML86QNKU9FO2LJDDQQTQPVT.example.com. 3600 IN NSEC3 1 1 10 - (
                                        UI312KQOP1NG8IQEIEFNPSLA94KB5Q92
                                        A RRSIG )
-UI312KQOP1NG8IQEIEFNPSLA94KB5Q92.example.com. 86400 IN NSEC3 1 0 10 - (
+UI312KQOP1NG8IQEIEFNPSLA94KB5Q92.example.com. 3600 IN NSEC3 1 0 10 - (
                                        UTQVUHU2BLK3DHMRR5T1HD9VTEOHQT0A 
                                        A RRSIG)
-UTQVUHU2BLK3DHMRR5T1HD9VTEOHQT0A.example.com. 86400 IN NSEC3 1 0 10 - (
+UTQVUHU2BLK3DHMRR5T1HD9VTEOHQT0A.example.com. 3600 IN NSEC3 1 0 10 - (
                                        20G1GOL477RO51RK9A9NFD54TFQAL7IQ
                                        NS SOA RRSIG DNSKEY NSEC3PARAM )
 
-UI312KQOP1NG8IQEIEFNPSLA94KB5Q92.example.com. 86400    RRSIG   NSEC3 7 3 86400 (
-                                       20840201000000 20160302125715 29600 example.com.
-                                       DummySignatureDummySignature4ey0Qcln
-                                       uquQZT+z2HIdCE9HeslAkTlu/Xt78vF4+3db
-                                       t2Vno21DkteA+w== )
-20G1GOL477RO51RK9A9NFD54TFQAL7IQ.example.com. 86400    RRSIG   NSEC3 7 3 86400 (
-                                       20840201000000 20160302125715 29600 example.com.
-                                       DummySignatureDummySignature4ey0Qcln
-                                       uquQZT+z2HIdCE9HeslAkTlu/Xt78vF4+3db
-                                       t2Vno21DkteA+w== )
-6DFJITU5VML86QNKU9FO2LJDDQQTQPVT.example.com. 86400    RRSIG   NSEC3 7 3 86400 (
-                                       20840201000000 20160302125715 29600 example.com.
-                                       KElp8dLKBKFzgEFV8r5aP9pCyYUD+Z8rLBA9
-                                       KkCDm1y82x5T/Cu5UXuZJwhvDGDzwPqoY5Dr
-                                       Qbiek52n6umbEw== )
-
-UTQVUHU2BLK3DHMRR5T1HD9VTEOHQT0A.example.com. 86400    RRSIG   NSEC3 7 3 86400 (
-                                       20840201000000 20160302125715 29600 example.com.
-                                       DPwNyH7r/4wIBfTGxikNv4pY7omY6IqpQS6Q
-                                       jtTNuStA+5gk98dvcgRjluxqo/+ZlZz4V53f
-                                       1y506ytGbX/q4Q== )
+20g1gol477ro51rk9a9nfd54tfqal7iq.example.com. 3600     RRSIG   NSEC3 13 3 3600 20400406101515 20210205084515 61806 example.com. k2hYD9qbLM8cRuN1fcLar/GsSufK/5oQYxRnE9bUDiKvC1WhCDF3pee6MSqybb3LoNkQUeOgGV4jdzvslzDlhQ==
+6dfjitu5vml86qnku9fo2ljddqqtqpvt.example.com. 3600     RRSIG   NSEC3 13 3 3600 20400406101515 20210205084515 61806 example.com. fGQRezo0T9Hd1tGJqhCXPyLONKSxOPmX1Kl7MjD1OVDLg9l5Ei9DmhrpCFxahXMBGIA4yy1J7mSK3PqelPMyFw==
+ui312kqop1ng8iqeiefnpsla94kb5q92.example.com. 3600     RRSIG   NSEC3 13 3 3600 20400406101515 20210205084515 61806 example.com. 6AmfjUgzO4Ew9FmW6koVhQ+98Vd7xI7kpFXwj8wb4ObmuM8uFu6tpvcT/jDcUduFuUb//DS5fS9fXraLNL8JUQ==
+utqvuhu2blk3dhmrr5t1hd9vteohqt0a.example.com. 3600     RRSIG   NSEC3 13 3 3600 20400406101515 20210205084515 61806 example.com. WMvFzIf9Ekvr0UVRzbZpxUAjT2Sf2KgsXek6iG786Iw6nZ/rzPVNlfNLhWvdqQmi5LEDp03UExshDlPz3JgOkQ==
 
 example.com.           3600    IN SOA  dns1.example.com. hostmaster.example.com. (
                                        2010111220 ; serial
@@ -53,58 +36,22 @@ example.com.                3600    IN SOA  dns1.example.com. hostmaster.example.com. (
                                        604800     ; expire (1 week)
                                        86400      ; minimum (1 day)
                                        )
-                       3600    RRSIG   SOA 7 2 3600 (
-                                       20840201000000 20160302125715 29600 example.com.
-                                       bGk1vLxVuJpcEy7n0gPvQVzfanbvINLJLcbD
-                                       eeie4sXZZAOwu6oQZy6kd8tvKtV4mL0OJzpH
-                                       XCO6BdZkmk/aQA== )
                        3600    NS      dns1.example.com.
-                       3600    RRSIG   NS 7 2 3600 (
-                                       20840201000000 20160302125715 29600 example.com.
-                                       roe4aBp4G3TqQ4x5eRxbVIjApIh17gXDjfOY
-                                       zvRFLOkrwqKz3eX9WrRiCk3bYNn8s1fuenaQ
-                                       OSV1D5SL7utX5w== )
-                       3600    DNSKEY  256 3 7 (
-                                       AwEAAcvvW/oJAjcRdntRC8J52baXoNFVWOFz
-                                       oVFe3Vgl8aBBiGh3gnbuNt7xKmy9z2qc2/35
-                                       MFwieWYfDdgUnPxyKMM=
-                                       ) ; ZSK; alg = NSEC3RSASHA1; key id = 29600
-                       3600    DNSKEY  257 3 7 (
-                                       AwEAAeXCF7sHLcFiaCwCFH4xh2CJcCp55i04
-                                       exG41EtzILS2waabEM5byhRkoylbv91q6HY+
-                                       JH9YXitS21LMD0Hqp1s=
-                                       ) ; KSK; alg = NSEC3RSASHA1; key id = 31323
-                       3600    RRSIG   DNSKEY 7 2 3600 (
-                                       20840201000000 20160302125715 29600 example.com.
-                                       c1yhXb8wRGYndpVqG61+lHAAbZg+JcVYGPX3
-                                       Fw0jYigN4G+P0+VUCqPLkC4yfJylzuefyGfk
-                                       TUmriM3ihfXxIg== )
-                       3600    RRSIG   DNSKEY 7 2 3600 (
-                                       20840201000000 20160302125715 31323 example.com.
-                                       mZiLLTzbdaj7EJ8uj3TwvcvAfaMxYjyavlGT
-                                       qpa+cElfvBDm7R6MF4MaEQ9aZ2ylMt1lppjq
-                                       YyYRaaQC6yhm4g== )
                        0       NSEC3PARAM 1 0 10 -
-                       0       RRSIG   NSEC3PARAM 7 2 0 (
-                                       20840201000000 20160302125715 29600 example.com.
-                                       K3PkVYZZV8QvZFtDsz9+ZfiM9wDkFu/eO2S5
-                                       tAtCXd1fktcW44TLWL0qADfFEEcMotvzLqv1
-                                       YJrD7TvrFDot8Q== )
-
-
-
 dns1.example.com.      3600    IN A    192.0.2.1
-                       3600    RRSIG   A 7 3 3600 (
-                                       20840201000000 20160302125715 29600 example.com.
-                                       vlzRtVFa44pRtdD8XZcgDa6021uA9A3TnNEw
-                                       5jRnor4aoftUuVQNAanQMCgrWk63d14XZ2d0
-                                       lqhxunAbh08dsQ== )
-
 www.example.com.       3600    IN A    192.0.2.1
-                       3600    RRSIG   A 7 3 3600 (
-                                       20840201000000 20160302125715 29600 example.com.
-                                       NWFuYaSEg3z3K4l/fHu/X9dK+rDZ177BbCNN
-                                       ZeFTPCAdOnX0nw1CQys629k7Vzdv1pHaanmy
-                                       0Ru0tX9R65NlKw== )
+
+example.com. 3600 DNSKEY 257 3 13 Yk8KOmyVzOij3x+Zs+eT4J2Up9+ipwXEKOhL9fTYY/DU10yIQt+zYm02UFZJX2oVTdHBCajpBFsZLH2X4ho1yw==
+example.com. 3600 DNSKEY 256 3 13 tCoteOM+A4o/A9uxgLyDg3HOg2DClU+3d+1XPQRtTfuaEFOGIpyH6qiFUv2b4DYuvmMyTkL99nxvyhA8yo0Cgg==
+example.com.           3600    RRSIG   DNSKEY 13 2 3600 20400405162736 20210204145736 25674 example.com. 5nIsRsT30KNhPS/i8rNhT/C3uPli0jb+7fLYL+eHKggTHk5UK69Z5EHA/ISKnbEOMIQA3QJ98XNreLJk+sTZ4w==
+
+example.com.           3600    RRSIG   NS 13 2 3600 20400405162736 20210204145736 61806 example.com. nzKbYNX9cbrf3zNMSRK4ftG/p4DLn/uB3BM29txIj0nyKxL1cmK0wsTltGmwLzJTegBy/LV1VtMudDLWEFU3sQ==
+example.com.           3600    RRSIG   SOA 13 2 3600 20400405162736 20210204145736 61806 example.com. HvtxfzCSLHjFSHuAyO+KKymy/vxOGLS8T1DuhfAoUtweHv1zVeYfbFOfCdcfs15PKO31ldqwWRvFWAhM+3hnrA==
+example.com.           0       RRSIG   NSEC3PARAM 13 2 0 20400405162736 20210204145736 61806 example.com. 8uDKYTVd+XuYFyzf/aNm6kMjZhbI8r+22v1AuuYYqgP5aH6/ZFXusczSGkPdcauVIgKLV1I7dBBQkQm2LNIqAA==
+deleg.example.com.     3600    RRSIG   A 13 3 3600 20400405162736 20210204145736 61806 example.com. beD3O8cnCQ+8HWZpn35gFrR2tLkb9tGpe143BfUA0aOkAr2PdK9CUBs47uSyWAATYoa11gtxxdFUzW6coa7l/w==
+deleg.example.com.     3600    RRSIG   NS 13 3 3600 20400405162736 20210204145736 61806 example.com. HJCAXBevueFA2BOP6eOnsbP1X+2VUQRGXRcYI2SDqqq4U2DQHWQMOfI+pKVpkfdc8D6qDYnFZSg6II/dDJQ0AQ==
+deleg.example.com.     3600    RRSIG   DS 13 3 3600 20400405162736 20210204145736 61806 example.com. DhZsh6wiPACEUz7GY4WpvcIrMOF+sU27kJAGKaCcpxv9jQBY7Jpf/otRf+yn+Bmm32RZUr5swSXMXAvDtCj6qA==
+dns1.example.com.      3600    RRSIG   A 13 3 3600 20400405162736 20210204145736 61806 example.com. z/pEp4EcGkmy+niefZRLgRo1LraBlJABdgpSo94cYEqJM3GBMHsPZeAKmqnMAYA5Nz0hQtTplqS3rsJHJJdQ7w==
+www.example.com.       3600    RRSIG   A 13 3 3600 20400405162736 20210204145736 61806 example.com. FpOwodJYlk3NxEEjGvY75r8Ptef13P4Um9N74NxV1QWQlqtBhg+1bndvaY376uBFVDFGsEiDFEgIoFL0Ao+PeA==
 
 
Mirror of https://gitlab.nic.cz/knot/knot-dns.git