- type CDS and CDNSKEY types in sldns.

git-svn-id: file:///svn/unbound/trunk@3220 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 7288690a43ff63aee532a504e635ac206864ab3a..671cb7d2500bfd2f440b10627b748141efdc99aa 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+5 September 2014: Wouter
+       - type CDS and CDNSKEY types in sldns.
+
 25 August 2014: Wouter
        - Fixup checklock code for log lock and its mutual initialization
          dependency.

diff --git a/ldns/rrdef.c b/ldns/rrdef.c
index 8f7dd3036eca1295f7a2472c06acda572c98dc1a..9b4bf7cfe326265edc23b60244427a34e1f86e9a 100644 (file)
--- a/ldns/rrdef.c
+++ b/ldns/rrdef.c
@@ -359,14 +359,10 @@ static sldns_rr_descriptor rdata_field_descriptors[] = {
        /* 58 */
        {LDNS_RR_TYPE_TALINK, "TALINK", 2, 2, type_talink_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 2 },
 
-#ifdef DRAFT_RRTYPES
        /* 59 */
        {LDNS_RR_TYPE_CDS, "CDS", 4, 4, type_ds_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
-#else
-{LDNS_RR_TYPE_NULL, "TYPE59", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
-#endif
-
-{LDNS_RR_TYPE_NULL, "TYPE60", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
+       /* 60 */
+       {LDNS_RR_TYPE_CDNSKEY, "CDNSKEY", 4, 4, type_dnskey_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_NULL, "TYPE61", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_NULL, "TYPE62", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_NULL, "TYPE63", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },

diff --git a/ldns/rrdef.h b/ldns/rrdef.h
index b4b5b2e2acf4c050b7cec4267344a3032bd25c30..933bcdfbf07efaa2cfa5a1999c12d86181bee250 100644 (file)
--- a/ldns/rrdef.h
+++ b/ldns/rrdef.h
@@ -191,8 +191,8 @@ enum sldns_enum_rr_type
        LDNS_RR_TYPE_RKEY = 57,
         /** draft-ietf-dnsop-trust-history */
         LDNS_RR_TYPE_TALINK = 58,
-       /** draft-barwood-dnsop-ds-publis */
-       LDNS_RR_TYPE_CDS = 59,
+       LDNS_RR_TYPE_CDS = 59, /** RFC 7344 */
+       LDNS_RR_TYPE_CDNSKEY = 60, /** RFC 7344 */
 
        LDNS_RR_TYPE_SPF = 99, /* RFC 4408 */