TLSA is not published yet, but we want to release!

+ fix typo

diff --git a/Changelog b/Changelog
index b55aaa0002d2493b508e0208f2d3bcb81dd5542b..43a1ee45f467251d4dcc9c43a8f364821fddc4f6 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -19,7 +19,6 @@
        * bugfix #429: fix doxyparse.pl fails on NetBSD because specified
          path to perl.
        * New ECDSA support (RFC 6605), use --disable-ecdsa for older openssl.
-       * New TLSA support (draft-ietf-dane-protocol).
        * fix verifying denial of existence for DS's in NSEC3 Opt-Out zones.
          Thanks John Barnitz
          functions.

diff --git a/ldns/rr.h b/ldns/rr.h
index 11aab392a9d9d6d24ebd907b2fb252f5fe5f76d8..9882931b48829e92c860c0dfcc152dffa5144cfe 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 53
+#define LDNS_RDATA_FIELD_DESCRIPTORS_COMMON 52
 
 
 
@@ -179,8 +179,7 @@ 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-ieft-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 230d1891c5f06419cdbeb5850802fee9e6b096a4..8f4ce85c7eb571e9ab95bef6cf784241aac8eef4 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -1941,10 +1941,6 @@ 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 */
@@ -2058,8 +2054,7 @@ static ldns_rr_descriptor rdata_field_descriptors[] = {
        /* 51 */
 {LDNS_RR_TYPE_NSEC3PARAM, "NSEC3PARAM", 4, 4, type_nsec3param_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
        /* 52 */
-{LDNS_RR_TYPE_TLSA, "TLSA", 4, 4, type_tlsa_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
-
+{LDNS_RR_TYPE_NULL, "TYPE52", 1, 1, type_0_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 },

diff --git a/str2host.c b/str2host.c
index c1f4b13aebdb912ab8ec26b7250cbc4e795665d9..2783f0805a41a059d1a55831b4dd2bcd2e63141c 100644 (file)
--- a/str2host.c
+++ b/str2host.c
@@ -794,7 +794,7 @@ ldns_str2rdf_tsig( ATTR_UNUSED(ldns_rdf **rd)
                 , ATTR_UNUSED(const char *str)
                 )
 {
-       /* there is no strign representation for TSIG rrs */
+       /* there is no string representation for TSIG rrs */
        return LDNS_STATUS_NOT_IMPL;
 }