Changeset 2948

Timestamp:

03/03/10 15:11:46 (6 months ago)

Author:

matthijs

Message:

hmac-md5 == hmac-md5.sig-alg.reg.int.

Location:

branches/OpenDNSSEC-1.0

Files:

• NEWS (modified) (1 diff)
• signer/tools/zone_fetcher.c (modified) (2 diffs)

branches/OpenDNSSEC-1.0/NEWS

@@ -10 +10 @@
 * Fix missing/redundant/spurious NSEC3 records
 * More proper memory cleanup in parsing zonefetch.xml
+* Zonefetch.xml now accepts hmac-md5, which is an alias for
+  hmac-md5.sig-alg.reg.int.
+
 
 OpenDNSSEC 1.0.0 - 2010-02-09

branches/OpenDNSSEC-1.0/signer/tools/zone_fetcher.c

@@ -882 +882 @@
         ldns_pkt_free(qpkt);
         if (status != LDNS_STATUS_OK) {
-            if (errno != EINPROGRESS) {
-                log_msg(LOG_ERR, "zone fetcher failed to start axfr: %s",
-                    ldns_get_errorstr_by_id(status));
-                return -1;
-            }
+            log_msg(LOG_ERR, "zone fetcher failed to start axfr: %s",
+                ldns_get_errorstr_by_id(status));
+            return -1;
         }
 
@@ -969 +967 @@
         if (config->use_tsig) {
             ldns_resolver_set_tsig_keyname(xfrd, config->tsig_name);
-            ldns_resolver_set_tsig_algorithm(xfrd, config->tsig_algo);
+            if (strncmp(config->tsig_algo, "hmac-md5", 8) == 0) {
+                ldns_resolver_set_tsig_algorithm(xfrd, "hmac-md5.sig-alg.reg.int.");
+            } else {
+                ldns_resolver_set_tsig_algorithm(xfrd, config->tsig_algo);
+            }
             ldns_resolver_set_tsig_keydata(xfrd, config->tsig_secret);
         }