From 416c7d330a1ae8f48c59c0b56a0d48e43ff2758a Mon Sep 17 00:00:00 2001 From: Kees Monshouwer Date: Fri, 28 Feb 2014 01:03:55 +0100 Subject: [PATCH] add additional levels of ents (auth and unauth) to the insecure delegation ent test --- modules/tinydnsbackend/data | 3 ++- modules/tinydnsbackend/data.cdb | Bin 1350778 -> 1350873 bytes .../tinydns-data-check/expected_result | 4 ++-- regression-tests/tests/axfr/expected_result | 3 ++- .../tests/axfr/expected_result.dnssec | 14 +++++++++----- .../tests/axfr/expected_result.nsec3 | 18 +++++++++++++----- .../tests/axfr/expected_result.nsec3-optout | 8 +++++++- .../ds-at-unsecure-zone-cut/expected_result | 2 +- .../expected_result.nsec3 | 2 +- .../expected_result.nsec3-optout | 2 +- .../tests/ent-unsigned-delegation/command | 2 +- .../ent-unsigned-delegation/expected_result | 2 +- .../expected_result.dnssec | 6 +++--- .../expected_result.narrow | 6 +++--- .../expected_result.nsec3 | 6 +++--- .../expected_result.nsec3-optout | 8 +++++--- regression-tests/zones/dnssec-parent.com | 3 ++- 17 files changed, 56 insertions(+), 33 deletions(-) diff --git a/modules/tinydnsbackend/data b/modules/tinydnsbackend/data index a324e7728..403966b6e 100644 --- a/modules/tinydnsbackend/data +++ b/modules/tinydnsbackend/data @@ -20228,11 +20228,12 @@ Zdnssec-parent.com:ns1.dnssec-parent.com.:ahu.example.com.:2005092501:28800:7200 +dnssec-parent.com:9.9.9.9:3600 &dnssec-parent.com::ns1.dnssec-parent.com.:3600 &dnssec-parent.com::ns2.dnssec-parent.com.:3600 +&insecure-delegated.ent.ent.auth-ent.dnssec-parent.com::ns.example.com.:3600 ++something1.auth-ent.dnssec-parent.com:1.1.2.3:3600 &delegated.dnssec-parent.com::ns1.delegated.dnssec-parent.com.:3600 &delegated.dnssec-parent.com::ns2.delegated.dnssec-parent.com.:3600 +ns1.delegated.dnssec-parent.com:4.5.6.7:3600 +ns2.delegated.dnssec-parent.com:5.6.7.8:3600 -&insecure-delegated.ent.dnssec-parent.com::ns.example.com.:3600 +ns1.dnssec-parent.com:1.2.3.4:3600 +ns2.dnssec-parent.com:4.3.2.1:3600 &secure-delegated.dnssec-parent.com::ns1.secure-delegated.dnssec-parent.com.:3600 diff --git a/modules/tinydnsbackend/data.cdb b/modules/tinydnsbackend/data.cdb index e258c3d33b272b6dec5779f8e474813c8db2d10f..916e491a575051833a450b76a45ed69ab4ab4ce6 100644 GIT binary patch delta 5349 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