From: Peter van Dijk Date: Wed, 23 Dec 2015 13:16:14 +0000 (+0100) Subject: disable testing tools that do not support ECDSA; revert this later X-Git-Tag: rec-4.0.0-alpha1^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d44560a7baeaa8c4d2f24abf70cfc9296b6453c1;p=thirdparty%2Fpdns.git disable testing tools that do not support ECDSA; revert this later --- diff --git a/regression-tests/tests/verify-dnssec-zone/command b/regression-tests/tests/verify-dnssec-zone/command index 7f92e3eeaa..70fe36d31e 100755 --- a/regression-tests/tests/verify-dnssec-zone/command +++ b/regression-tests/tests/verify-dnssec-zone/command @@ -3,7 +3,7 @@ for zone in $(grep 'zone ' named.conf | cut -f2 -d\" | grep -v '^\(example.com\ do TFILE=$(mktemp tmp.XXXXXXXXXX) drill -p $port axfr $zone @$nameserver | ldns-read-zone -z > $TFILE - for validator in "ldns-verify-zone -V2" validns jdnssec-verifyzone named-checkzone + for validator in "ldns-verify-zone -V2" named-checkzone do echo --- $validator $zone if [ "$validator" = "named-checkzone" ] diff --git a/regression-tests/tests/verify-dnssec-zone/expected_result b/regression-tests/tests/verify-dnssec-zone/expected_result index 68f1d54ba1..a116ca02b2 100644 --- a/regression-tests/tests/verify-dnssec-zone/expected_result +++ b/regression-tests/tests/verify-dnssec-zone/expected_result @@ -1,13 +1,6 @@ --- ldns-verify-zone -V2 test.com RETVAL: 0 ---- validns test.com -RETVAL: 0 - ---- jdnssec-verifyzone test.com -zone verified. -RETVAL: 0 - --- named-checkzone test.com zone test.com/IN: test.com/MX 'smtp-servers.test.com' has no address records (A or AAAA) zone test.com/IN: sub.test.test.com/NS 'ns-test.example.net.test.com' has no address records (A or AAAA) @@ -18,13 +11,6 @@ RETVAL: 0 --- ldns-verify-zone -V2 test.dyndns RETVAL: 0 ---- validns test.dyndns -RETVAL: 0 - ---- jdnssec-verifyzone test.dyndns -zone verified. -RETVAL: 0 - --- named-checkzone test.dyndns zone test.dyndns/IN: loaded serial 2012060701 (DNSSEC signed) OK @@ -33,13 +19,6 @@ RETVAL: 0 --- ldns-verify-zone -V2 wtest.com RETVAL: 0 ---- validns wtest.com -RETVAL: 0 - ---- jdnssec-verifyzone wtest.com -zone verified. -RETVAL: 0 - --- named-checkzone wtest.com zone wtest.com/IN: wtest.com/MX 'smtp-servers.wtest.com' is a CNAME (illegal) zone wtest.com/IN: loaded serial 2005092501 (DNSSEC signed) @@ -49,13 +28,6 @@ RETVAL: 0 --- ldns-verify-zone -V2 dnssec-parent.com RETVAL: 0 ---- validns dnssec-parent.com -RETVAL: 0 - ---- jdnssec-verifyzone dnssec-parent.com -zone verified. -RETVAL: 0 - --- named-checkzone dnssec-parent.com zone dnssec-parent.com/IN: loaded serial 2005092501 (DNSSEC signed) OK @@ -64,13 +36,6 @@ RETVAL: 0 --- ldns-verify-zone -V2 delegated.dnssec-parent.com RETVAL: 0 ---- validns delegated.dnssec-parent.com -RETVAL: 0 - ---- jdnssec-verifyzone delegated.dnssec-parent.com -zone verified. -RETVAL: 0 - --- named-checkzone delegated.dnssec-parent.com zone delegated.dnssec-parent.com/IN: loaded serial 2005092501 (DNSSEC signed) OK @@ -79,13 +44,6 @@ RETVAL: 0 --- ldns-verify-zone -V2 secure-delegated.dnssec-parent.com RETVAL: 0 ---- validns secure-delegated.dnssec-parent.com -RETVAL: 0 - ---- jdnssec-verifyzone secure-delegated.dnssec-parent.com -zone verified. -RETVAL: 0 - --- named-checkzone secure-delegated.dnssec-parent.com zone secure-delegated.dnssec-parent.com/IN: loaded serial 2005092501 (DNSSEC signed) OK @@ -94,13 +52,6 @@ RETVAL: 0 --- ldns-verify-zone -V2 minimal.com RETVAL: 0 ---- validns minimal.com -RETVAL: 0 - ---- jdnssec-verifyzone minimal.com -zone verified. -RETVAL: 0 - --- named-checkzone minimal.com zone minimal.com/IN: loaded serial 2000081501 (DNSSEC signed) OK @@ -109,13 +60,6 @@ RETVAL: 0 --- ldns-verify-zone -V2 tsig.com RETVAL: 0 ---- validns tsig.com -RETVAL: 0 - ---- jdnssec-verifyzone tsig.com -zone verified. -RETVAL: 0 - --- named-checkzone tsig.com zone tsig.com/IN: loaded serial 2000081501 (DNSSEC signed) OK @@ -124,13 +68,6 @@ RETVAL: 0 --- ldns-verify-zone -V2 stest.com RETVAL: 0 ---- validns stest.com -RETVAL: 0 - ---- jdnssec-verifyzone stest.com -zone verified. -RETVAL: 0 - --- named-checkzone stest.com zone stest.com/IN: loaded serial 2000081501 (DNSSEC signed) OK diff --git a/regression-tests/tests/verify-dnssec-zone/expected_result.nsec3 b/regression-tests/tests/verify-dnssec-zone/expected_result.nsec3 index 68f1d54ba1..a116ca02b2 100644 --- a/regression-tests/tests/verify-dnssec-zone/expected_result.nsec3 +++ b/regression-tests/tests/verify-dnssec-zone/expected_result.nsec3 @@ -1,13 +1,6 @@ --- ldns-verify-zone -V2 test.com RETVAL: 0 ---- validns test.com -RETVAL: 0 - ---- jdnssec-verifyzone test.com -zone verified. -RETVAL: 0 - --- named-checkzone test.com zone test.com/IN: test.com/MX 'smtp-servers.test.com' has no address records (A or AAAA) zone test.com/IN: sub.test.test.com/NS 'ns-test.example.net.test.com' has no address records (A or AAAA) @@ -18,13 +11,6 @@ RETVAL: 0 --- ldns-verify-zone -V2 test.dyndns RETVAL: 0 ---- validns test.dyndns -RETVAL: 0 - ---- jdnssec-verifyzone test.dyndns -zone verified. -RETVAL: 0 - --- named-checkzone test.dyndns zone test.dyndns/IN: loaded serial 2012060701 (DNSSEC signed) OK @@ -33,13 +19,6 @@ RETVAL: 0 --- ldns-verify-zone -V2 wtest.com RETVAL: 0 ---- validns wtest.com -RETVAL: 0 - ---- jdnssec-verifyzone wtest.com -zone verified. -RETVAL: 0 - --- named-checkzone wtest.com zone wtest.com/IN: wtest.com/MX 'smtp-servers.wtest.com' is a CNAME (illegal) zone wtest.com/IN: loaded serial 2005092501 (DNSSEC signed) @@ -49,13 +28,6 @@ RETVAL: 0 --- ldns-verify-zone -V2 dnssec-parent.com RETVAL: 0 ---- validns dnssec-parent.com -RETVAL: 0 - ---- jdnssec-verifyzone dnssec-parent.com -zone verified. -RETVAL: 0 - --- named-checkzone dnssec-parent.com zone dnssec-parent.com/IN: loaded serial 2005092501 (DNSSEC signed) OK @@ -64,13 +36,6 @@ RETVAL: 0 --- ldns-verify-zone -V2 delegated.dnssec-parent.com RETVAL: 0 ---- validns delegated.dnssec-parent.com -RETVAL: 0 - ---- jdnssec-verifyzone delegated.dnssec-parent.com -zone verified. -RETVAL: 0 - --- named-checkzone delegated.dnssec-parent.com zone delegated.dnssec-parent.com/IN: loaded serial 2005092501 (DNSSEC signed) OK @@ -79,13 +44,6 @@ RETVAL: 0 --- ldns-verify-zone -V2 secure-delegated.dnssec-parent.com RETVAL: 0 ---- validns secure-delegated.dnssec-parent.com -RETVAL: 0 - ---- jdnssec-verifyzone secure-delegated.dnssec-parent.com -zone verified. -RETVAL: 0 - --- named-checkzone secure-delegated.dnssec-parent.com zone secure-delegated.dnssec-parent.com/IN: loaded serial 2005092501 (DNSSEC signed) OK @@ -94,13 +52,6 @@ RETVAL: 0 --- ldns-verify-zone -V2 minimal.com RETVAL: 0 ---- validns minimal.com -RETVAL: 0 - ---- jdnssec-verifyzone minimal.com -zone verified. -RETVAL: 0 - --- named-checkzone minimal.com zone minimal.com/IN: loaded serial 2000081501 (DNSSEC signed) OK @@ -109,13 +60,6 @@ RETVAL: 0 --- ldns-verify-zone -V2 tsig.com RETVAL: 0 ---- validns tsig.com -RETVAL: 0 - ---- jdnssec-verifyzone tsig.com -zone verified. -RETVAL: 0 - --- named-checkzone tsig.com zone tsig.com/IN: loaded serial 2000081501 (DNSSEC signed) OK @@ -124,13 +68,6 @@ RETVAL: 0 --- ldns-verify-zone -V2 stest.com RETVAL: 0 ---- validns stest.com -RETVAL: 0 - ---- jdnssec-verifyzone stest.com -zone verified. -RETVAL: 0 - --- named-checkzone stest.com zone stest.com/IN: loaded serial 2000081501 (DNSSEC signed) OK diff --git a/regression-tests/tests/verify-dnssec-zone/expected_result.nsec3-optout b/regression-tests/tests/verify-dnssec-zone/expected_result.nsec3-optout index e1949f58ed..b8d3184a98 100644 --- a/regression-tests/tests/verify-dnssec-zone/expected_result.nsec3-optout +++ b/regression-tests/tests/verify-dnssec-zone/expected_result.nsec3-optout @@ -1,13 +1,6 @@ --- ldns-verify-zone -V2 test.com RETVAL: 0 ---- validns test.com -RETVAL: 0 - ---- jdnssec-verifyzone test.com -zone verified. -RETVAL: 0 - --- named-checkzone test.com zone test.com/IN: test.com/MX 'smtp-servers.test.com' has no address records (A or AAAA) zone test.com/IN: sub.test.test.com/NS 'ns-test.example.net.test.com' has no address records (A or AAAA) @@ -18,13 +11,6 @@ RETVAL: 0 --- ldns-verify-zone -V2 test.dyndns RETVAL: 0 ---- validns test.dyndns -RETVAL: 0 - ---- jdnssec-verifyzone test.dyndns -zone verified. -RETVAL: 0 - --- named-checkzone test.dyndns zone test.dyndns/IN: loaded serial 2012060701 (DNSSEC signed) OK @@ -33,13 +19,6 @@ RETVAL: 0 --- ldns-verify-zone -V2 wtest.com RETVAL: 0 ---- validns wtest.com -RETVAL: 0 - ---- jdnssec-verifyzone wtest.com -zone verified. -RETVAL: 0 - --- named-checkzone wtest.com zone wtest.com/IN: wtest.com/MX 'smtp-servers.wtest.com' is a CNAME (illegal) zone wtest.com/IN: loaded serial 2005092501 (DNSSEC signed) @@ -52,13 +31,6 @@ Error: there is no NSEC(3) for ent.ent.auth-ent.dnssec-parent.com. There were errors in the zone RETVAL: 11 ---- validns dnssec-parent.com -RETVAL: 0 - ---- jdnssec-verifyzone dnssec-parent.com -zone verified. -RETVAL: 0 - --- named-checkzone dnssec-parent.com zone dnssec-parent.com/IN: loaded serial 2005092501 (DNSSEC signed) OK @@ -67,13 +39,6 @@ RETVAL: 0 --- ldns-verify-zone -V2 delegated.dnssec-parent.com RETVAL: 0 ---- validns delegated.dnssec-parent.com -RETVAL: 0 - ---- jdnssec-verifyzone delegated.dnssec-parent.com -zone verified. -RETVAL: 0 - --- named-checkzone delegated.dnssec-parent.com zone delegated.dnssec-parent.com/IN: loaded serial 2005092501 (DNSSEC signed) OK @@ -82,13 +47,6 @@ RETVAL: 0 --- ldns-verify-zone -V2 secure-delegated.dnssec-parent.com RETVAL: 0 ---- validns secure-delegated.dnssec-parent.com -RETVAL: 0 - ---- jdnssec-verifyzone secure-delegated.dnssec-parent.com -zone verified. -RETVAL: 0 - --- named-checkzone secure-delegated.dnssec-parent.com zone secure-delegated.dnssec-parent.com/IN: loaded serial 2005092501 (DNSSEC signed) OK @@ -97,13 +55,6 @@ RETVAL: 0 --- ldns-verify-zone -V2 minimal.com RETVAL: 0 ---- validns minimal.com -RETVAL: 0 - ---- jdnssec-verifyzone minimal.com -zone verified. -RETVAL: 0 - --- named-checkzone minimal.com zone minimal.com/IN: loaded serial 2000081501 (DNSSEC signed) OK @@ -112,13 +63,6 @@ RETVAL: 0 --- ldns-verify-zone -V2 tsig.com RETVAL: 0 ---- validns tsig.com -RETVAL: 0 - ---- jdnssec-verifyzone tsig.com -zone verified. -RETVAL: 0 - --- named-checkzone tsig.com zone tsig.com/IN: loaded serial 2000081501 (DNSSEC signed) OK @@ -127,13 +71,6 @@ RETVAL: 0 --- ldns-verify-zone -V2 stest.com RETVAL: 0 ---- validns stest.com -RETVAL: 0 - ---- jdnssec-verifyzone stest.com -zone verified. -RETVAL: 0 - --- named-checkzone stest.com zone stest.com/IN: loaded serial 2000081501 (DNSSEC signed) OK