Merge upstream r4302 to support multiple concurrently valid anchors.

This commit is contained in:
Dag-Erling Smørgrav 2017-08-31 11:43:21 +00:00
parent bd51c20871
commit 31f8d531e1
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/vendor/unbound/dist/; revision=323048

View File

@ -1571,6 +1571,11 @@ key_matches_a_ds(struct module_env* env, struct val_env* ve,
verbose(VERB_ALGO, "DS match attempt failed");
continue;
}
/* match of hash is sufficient for bootstrap of trust point */
(void)reason;
(void)ve;
return 1;
/* no need to check RRSIG, DS hash already matched with source
if(dnskey_verify_rrset(env, ve, dnskey_rrset,
dnskey_rrset, key_idx, &reason) == sec_status_secure) {
return 1;
@ -1578,6 +1583,7 @@ key_matches_a_ds(struct module_env* env, struct val_env* ve,
verbose(VERB_ALGO, "DS match failed because the key "
"does not verify the keyset: %s", reason);
}
*/
}
return 0;
}