CDS and CDNSKEY are RFC 7344 now

diff --git a/Changelog b/Changelog
index 1f6ec18dc28b04d3d8b2591bc46faffdcc997b15..9c46513bc35a314fbec65f102fb6c3bedc3570c9 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -16,9 +16,10 @@ TBD
        * Fix configure to make ldns compile with LibreSSL 2.0
        * drill now also accepts dig style -y option
          (-y <[algo:]name:key> i.s.o. -y <name:key[:algo]>)
-       * CDNSKEY and OPENPGPKEY draft rr types.
-         enable with: --enable-rrtype-cdnskey and --enable-rrtype-openpgpkey
+       * OPENPGPKEY draft rr types. Enable with: --enable-rrtype-openpgpkey
        * bugfix #608: Correct comment about escaped characters
+       * CDS and CDNSKEY rr type from RFC 7344.
+         --enable-rrtype-cds configure option removed
 
 1.6.17 2014-01-10
        * Fix ldns_dnssec_zone_new_frm_fp_l to allow the last parsed line of a

diff --git a/configure.ac b/configure.ac
index eaff025af9b74c751b0f47433969afcb94aed85b..c582621d5c2d97027f4b00a487d9fc583b94c8f5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -392,22 +392,6 @@ case "$enable_rrtype_rkey" in
        no|*)
                ;;
 esac
-AC_ARG_ENABLE(rrtype-cds, AC_HELP_STRING([--enable-rrtype-cds], [Enable draft RR type cds.]))
-case "$enable_rrtype_cds" in
-       yes)
-               AC_DEFINE_UNQUOTED([RRTYPE_CDS], [], [Define this to enable RR type CDS.])
-               ;;
-       no|*)
-               ;;
-esac
-AC_ARG_ENABLE(rrtype-cdnskey, AC_HELP_STRING([--enable-rrtype-cdnskey], [Enable draft RR type cdnskey.]))
-case "$enable_rrtype_cdnskey" in
-       yes)
-               AC_DEFINE_UNQUOTED([RRTYPE_CDNSKEY], [], [Define this to enable RR type CDNSKEY.])
-               ;;
-       no|*)
-               ;;
-esac
 AC_ARG_ENABLE(rrtype-openpgpkey, AC_HELP_STRING([--enable-rrtype-openpgpkey], [Enable draft RR type openpgpkey.]))
 case "$enable_rrtype_openpgpkey" in
        yes)

diff --git a/ldns/rr.h b/ldns/rr.h
index 6dcce80ba13f92da8b4bf79ec79debc69bd2bd2e..75ac352df3acd1a5ae2e98b77e41322f4d5b5453 100644 (file)
--- a/ldns/rr.h
+++ b/ldns/rr.h
@@ -189,10 +189,8 @@ enum ldns_enum_rr_type
        LDNS_RR_TYPE_RKEY = 57,
         /** draft-ietf-dnsop-trust-history */
         LDNS_RR_TYPE_TALINK = 58,
-       /** draft-ietf-dnsop-delegation-trust-maintainance */
-       LDNS_RR_TYPE_CDS = 59,
-       /** draft-ietf-dnsop-delegation-trust-maintainance */
-       LDNS_RR_TYPE_CDNSKEY = 60,
+       LDNS_RR_TYPE_CDS = 59, /* RFC 7344 */
+       LDNS_RR_TYPE_CDNSKEY = 60, /* RFC 7344 */
        /** draft-ietf-dane-openpgpkey */
        LDNS_RR_TYPE_OPENPGPKEY = 61,
 

diff --git a/rr.c b/rr.c
index 813c67fb7e390f353c893b27b0075f0598cb4aa8..e5c990123979e9e44a14302de83fcfc5fb3b4028 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -2167,19 +2167,10 @@ static ldns_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 RRTYPE_CDS
        /* 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
-
-#ifdef RRTYPE_CDNSKEY
        /* 60 */
        {LDNS_RR_TYPE_CDNSKEY, "CDNSKEY", 4, 4, type_dnskey_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
-#else
-{LDNS_RR_TYPE_NULL, "TYPE60", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
-#endif
 
 #ifdef RRTYPE_OPENPGPKEY
        /* 61 */