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

diff --git a/dnssec.c b/dnssec.c
index 2ebc8b621457a2dc795d8ab235a74ad2166ce0bc..a1577f79bf87e89f2d40968f6327f1cac6fc0485 100644 (file)
--- 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) {