Oops, even defines for ecdsa are nog given without USE_ECDSA.

Also rearrangement of variable declaration to stop splint complaining.

diff --git a/dnssec.c b/dnssec.c
index 0bb524f1064c1cd680d26f2cf4ae9cc7b4e4abd7..2e7e0bc1e0ad8669beedceca03a1d2d87300be3f 100644 (file)
--- a/dnssec.c
+++ b/dnssec.c
@@ -535,18 +535,17 @@ ldns_key_rr2ds(const ldns_rr *key, ldns_hash h)
                ldns_rr_free(ds);
                return NULL;
 #endif
-       case LDNS_SHA384:
 #ifdef USE_ECDSA
+               /* Make similar ``not implemented'' construct as above when 
+                  draft-hoffman-dnssec-ecdsa-04 becomes a standard
+                */
+       case LDNS_SHA384:
                digest = LDNS_XMALLOC(uint8_t, SHA384_DIGEST_LENGTH);
                if (!digest) {
                        ldns_rr_free(ds);
                        return NULL;
                }
                 break;
-#else
-               /* not implemented */
-               ldns_rr_free(ds);
-               return NULL;
 #endif
        }
 

diff --git a/dnssec_verify.c b/dnssec_verify.c
index 9413266d314b7006c62f5ca04406ec1fe7b9351e..69b8f29bb8d3588f294b2f4d1fdeea7ce0e90ac3 100644 (file)
--- a/dnssec_verify.c
+++ b/dnssec_verify.c
@@ -1080,6 +1080,9 @@ ldns_fetch_valid_domain_keys(const ldns_resolver *res,
 {
        ldns_rr_list * trusted_keys = NULL;
        ldns_rr_list * ds_keys = NULL;
+       ldns_rdf * prev_parent_domain;
+       ldns_rdf *      parent_domain;
+       ldns_rr_list * parent_keys = NULL;
 
        if (res && domain && keys) {
 
@@ -1091,10 +1094,7 @@ ldns_fetch_valid_domain_keys(const ldns_resolver *res,
                        /* No trusted keys in this domain, we'll have to find some in the parent domain */
                        *status = LDNS_STATUS_CRYPTO_NO_TRUSTED_DNSKEY;
 
-                       ldns_rdf * parent_domain = ldns_dname_left_chop(domain);
-                       ldns_rdf * prev_parent_domain;
-                       ldns_rr_list * parent_keys = NULL;
-      
+                       parent_domain = ldns_dname_left_chop(domain);
                        while (ldns_rdf_size(parent_domain) > 0) {
                                /* Fail if we are at the root */