re tlsa

diff --git a/Changelog b/Changelog
index 36c3ca56f1b4c9304b47d933888558e23aeeece4..6aa7d358781326c12956920b39bc9615af1f45f8 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -13,6 +13,7 @@
        * New -p option for ldns-read-zone to prepend-pad SOA serial to take
          up ten characters.
        * Return error if printing RR fails due to unknown/null RDATA.
+       * New TLSA support (draft-ietf-dane-protocol).
 
 1.6.13 2012-05-21
        * New -S option for ldns-verify-zone to chase signatures online.

diff --git a/ldns/rr.h b/ldns/rr.h
index 9882931b48829e92c860c0dfcc152dffa5144cfe..0520dcfe102d2a437aad41a8879d2be36912f1a9 100644 (file)
--- a/ldns/rr.h
+++ b/ldns/rr.h
@@ -37,7 +37,7 @@ extern "C" {
 #define LDNS_RR_OVERHEAD       10
 
 /* The first fields are 'common' and can be referenced instantly */
-#define LDNS_RDATA_FIELD_DESCRIPTORS_COMMON 52
+#define LDNS_RDATA_FIELD_DESCRIPTORS_COMMON 53
 
 
 
@@ -179,6 +179,8 @@ enum ldns_enum_rr_type
        LDNS_RR_TYPE_NSEC3 = 50, /* RFC 5155 */
        LDNS_RR_TYPE_NSEC3PARAM = 51, /* RFC 5155 */
        LDNS_RR_TYPE_NSEC3PARAMS = 51,
+       /** draft-ietf-dane-protocol */
+       LDNS_RR_TYPE_TLSA = 52,
 
         /** draft-ietf-dnsop-trust-history */
         LDNS_RR_TYPE_TALINK = 58,

diff --git a/rr.c b/rr.c
index e11594f5440701448a9db603fcc684ba7733fb7b..0254d4763bb3850e7402bef237137ef1de7f6da2 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -1941,6 +1941,12 @@ static const ldns_rdf_type type_tsig_wireformat[] = {
        LDNS_RDF_TYPE_INT16,
        LDNS_RDF_TYPE_INT16_DATA
 };
+static const ldns_rdf_type type_tlsa_wireformat[] = {
+       LDNS_RDF_TYPE_INT8,
+       LDNS_RDF_TYPE_INT8,
+       LDNS_RDF_TYPE_INT8,
+       LDNS_RDF_TYPE_HEX
+};
 /** \endcond */
 
 /** \cond */
@@ -2048,13 +2054,14 @@ static ldns_rr_descriptor rdata_field_descriptors[] = {
        /* 48 */
        {LDNS_RR_TYPE_DNSKEY, "DNSKEY", 4, 4, type_dnskey_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
        /* 49 */
-{LDNS_RR_TYPE_DHCID, "DHCID", 1, 1, type_dhcid_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
+       {LDNS_RR_TYPE_DHCID, "DHCID", 1, 1, type_dhcid_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
        /* 50 */
        {LDNS_RR_TYPE_NSEC3, "NSEC3", 5, 6, type_nsec3_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
        /* 51 */
-{LDNS_RR_TYPE_NSEC3PARAM, "NSEC3PARAM", 4, 4, type_nsec3param_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
+       {LDNS_RR_TYPE_NSEC3PARAM, "NSEC3PARAM", 4, 4, type_nsec3param_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
        /* 52 */
-{LDNS_RR_TYPE_NULL, "TYPE52", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
+       {LDNS_RR_TYPE_TLSA, "TLSA", 4, 4, type_tlsa_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
+
 {LDNS_RR_TYPE_NULL, "TYPE53", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_NULL, "TYPE54", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 {LDNS_RR_TYPE_NULL, "TYPE55", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },