From: Matthijs Mekking <matje@NLnetLabs.nl>
Date: Wed, 9 May 2012 08:20:21 +0000 (+0000)
Subject: TLSA is not published yet, but we want to release!
X-Git-Tag: release-1.6.13rc1~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90e939b8bdad5cb9325fb5362f92e97ff86fcead;p=thirdparty%2Fldns.git

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

+ fix typo
---

diff --git a/Changelog b/Changelog
index b55aaa00..43a1ee45 100644
--- 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 11aab392..9882931b 100644
--- 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 230d1891..8f4ce85c 100644
--- 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 c1f4b13a..2783f080 100644
--- 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;
 }