auth: test CDS multi digest and removal

diff --git a/regression-tests.nobackend/default-publish-cds/command b/regression-tests.nobackend/default-publish-cds/command
index 47f161a9de565fcc9460417948e3f87713c411ac..81cb958515bd72964f34188d93a80bd55da8c478 100755 (executable)
--- a/regression-tests.nobackend/default-publish-cds/command
+++ b/regression-tests.nobackend/default-publish-cds/command
@@ -37,7 +37,9 @@ bindwait
 
 $SDIG 127.0.0.1 $port minimal.com CDS dnssec | LC_ALL=C sort
 $SAXFR 127.0.0.1 $port minimal.com dnssec | LC_ALL=C sort
-$PDNSUTIL --config-dir=default-publish-cds set-publish-cds minimal.com 2
+$PDNSUTIL --config-dir=default-publish-cds set-publish-cds minimal.com '1 2'
+$SDIG 127.0.0.1 $port minimal.com CDS dnssec | LC_ALL=C sort
+$PDNSUTIL --config-dir=default-publish-cds set-publish-cds minimal.com '1 0 2'
 $SDIG 127.0.0.1 $port minimal.com CDS dnssec | LC_ALL=C sort
 $SAXFR 127.0.0.1 $port minimal.com dnssec | LC_ALL=C sort
 $PDNSUTIL --config-dir=default-publish-cds set-publish-cds minimal.com ''

diff --git a/regression-tests.nobackend/default-publish-cds/expected_result b/regression-tests.nobackend/default-publish-cds/expected_result
index 3c1643231be23e76a2313e84211bdd46e6439a49..cfbd4b0c11a039c83c369162bb0a251251a6765e 100644 (file)
--- a/regression-tests.nobackend/default-publish-cds/expected_result
+++ b/regression-tests.nobackend/default-publish-cds/expected_result
@@ -20,12 +20,19 @@ minimal.com.        86400   IN      DNSKEY  257 3 13 ...
 minimal.com.   86400   IN      DNSKEY  257 3 13 ...
 minimal.com.   86400   IN      RRSIG   CDS 13 2 86400 [expiry] [inception] [keytag] minimal.com. ...
 minimal.com.   86400   IN      RRSIG   DNSKEY 13 2 86400 [expiry] [inception] [keytag] minimal.com. ...
+0      minimal.com.    IN      CDS     86400   19988 13 1 99173ff8dd534e1e9092572d4008ccb9381424b3
 0      minimal.com.    IN      CDS     86400   19988 13 2 f317da762321935edfca118cd5dac67b8ef5d8826f63c4399ddf7fbe2415734e
+0      minimal.com.    IN      CDS     86400   44631 13 1 c7e816f8e73d4a4a3b8d06d7376833d525bdd7db
 0      minimal.com.    IN      CDS     86400   44631 13 2 25b688fbaf349a706bf0d8b02ac858f0567cf601ca1a9d7f34bb08c43928093e
 0      minimal.com.    IN      RRSIG   86400   CDS 13 2 86400 [expiry] [inception] [keytag] minimal.com. ...
 2      .       IN      OPT     32768   
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='minimal.com.', qtype=CDS
+0      minimal.com.    IN      CDS     86400   0 0 0 00
+0      minimal.com.    IN      RRSIG   86400   CDS 13 2 86400 [expiry] [inception] [keytag] minimal.com. ...
+2      .       IN      OPT     32768   
+Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Reply to question for qname='minimal.com.', qtype=CDS
 minimal.com.   120     IN      NS      ns1.example.com.
 minimal.com.   120     IN      NS      ns2.example.com.
 minimal.com.   120     IN      NSEC    minimal.com. NS SOA RRSIG NSEC DNSKEY CDS
@@ -34,8 +41,7 @@ minimal.com.  120     IN      RRSIG   NSEC 13 2 120 [expiry] [inception] [keytag] minimal.co
 minimal.com.   120     IN      RRSIG   SOA 13 2 120 [expiry] [inception] [keytag] minimal.com. ...
 minimal.com.   120     IN      SOA     ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400
 minimal.com.   120     IN      SOA     ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400
-minimal.com.   86400   IN      CDS     19988 13 2 f317da762321935edfca118cd5dac67b8ef5d8826f63c4399ddf7fbe2415734e
-minimal.com.   86400   IN      CDS     44631 13 2 25b688fbaf349a706bf0d8b02ac858f0567cf601ca1a9d7f34bb08c43928093e
+minimal.com.   86400   IN      CDS     0 0 0 00
 minimal.com.   86400   IN      DNSKEY  257 3 13 ...
 minimal.com.   86400   IN      DNSKEY  257 3 13 ...
 minimal.com.   86400   IN      RRSIG   CDS 13 2 86400 [expiry] [inception] [keytag] minimal.com. ...