From: Jelte Jansen <jeltejan@NLnetLabs.nl>
Date: Wed, 8 Aug 2007 12:02:57 +0000 (+0000)
Subject: merge canonicalization fix from 1.2.x (rev. 2406-2412)
X-Git-Tag: ldns-1.3.0_pre_20070822~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ee79fadb1e87503b2ec27e80c070d3c0cfdbfa8;p=thirdparty%2Fldns.git

merge canonicalization fix from 1.2.x (rev. 2406-2412)
---

diff --git a/dnssec.c b/dnssec.c
index 2ebc8b62..a1577f79 100644
--- a/dnssec.c
+++ b/dnssec.c
@@ -1579,12 +1579,16 @@ ldns_key_rr2ds(const ldns_rr *key, ldns_hash h)
 
 	/* digest */
 	/* owner name */
-	if (ldns_rdf2buffer_wire(data_buf, ldns_rr_owner(key)) != LDNS_STATUS_OK) {
+        tmp = ldns_rdf_clone(ldns_rr_owner(key));
+        ldns_dname2canonical(tmp);
+	if (ldns_rdf2buffer_wire(data_buf, tmp) != LDNS_STATUS_OK) {
 		LDNS_FREE(digest);
 		ldns_buffer_free(data_buf);
 		ldns_rr_free(ds);
+		ldns_rdf_deep_free(tmp);
 		return NULL;
 	}
+	ldns_rdf_deep_free(tmp);
 
 	/* all the rdata's */
 	if (ldns_rr_rdata2buffer_wire(data_buf, (ldns_rr*)key) != LDNS_STATUS_OK) {