Make ldns_calc_keytag() available for CDNSKEY RR

diff --git a/dnssec.c b/dnssec.c
index 0a7beb4ebfd41a2b97661bbefb2da6162c4e98e2..c1bf91f15253e02b91a3f81d1b1252b67b430a59 100644 (file)
--- a/dnssec.c
+++ b/dnssec.c
@@ -285,6 +285,7 @@ ldns_calc_keytag(const ldns_rr *key)
        }
 
        if (ldns_rr_get_type(key) != LDNS_RR_TYPE_DNSKEY &&
+           ldns_rr_get_type(key) != LDNS_RR_TYPE_CDNSKEY &&
            ldns_rr_get_type(key) != LDNS_RR_TYPE_KEY
            ) {
                return 0;

diff --git a/test/12-unit-tests-dnssec.tpkg/12-unit-tests-dnssec.c b/test/12-unit-tests-dnssec.tpkg/12-unit-tests-dnssec.c
index c80ea65970327e4faced667e780617a9b3a7222e..41ba460eac26d23bf9b8a4f25f0b14341f3741a5 100644 (file)
--- a/test/12-unit-tests-dnssec.tpkg/12-unit-tests-dnssec.c
+++ b/test/12-unit-tests-dnssec.tpkg/12-unit-tests-dnssec.c
@@ -62,6 +62,12 @@ check_ldns_calc_keytag(void)
                result = LDNS_STATUS_ERR;
        }
 
+       key_str = "jelte.nlnetlabs.nl. IN CDNSKEY 256 3 5 AQOraLfzarHAlFskVGwAGnX0LRjlcOiO6y5WM4Kz+QvZ9vX28h4lOvnf d5tkxnZm7ERLTAJoFq+1w/wl7VXs2Isz75BSZ7LQh3OT2xXnS6VT5ZxX ko/UCOdoGiKZZ63jHZ0jNSTCYy8+5rfvwRD8s3gGuErp5KcHg3V8VLUK SDNNEQ==";
+       expected_keytag = 42860;
+       if (check_ldns_calc_keytag_part(key_str, expected_keytag) != LDNS_STATUS_OK) {
+               result = LDNS_STATUS_ERR;
+       }
+
 /* template for adding extra keys
        key_str = "";
        expected_keytag = ;