Author: des
Date: Thu Aug 31 11:43:21 2017
New Revision: 323048
URL: https://svnweb.freebsd.org/changeset/base/323048

Log:
  Merge upstream r4302 to support multiple concurrently valid anchors.

Modified:
  vendor/unbound/dist/validator/autotrust.c

Modified: vendor/unbound/dist/validator/autotrust.c
==============================================================================
--- vendor/unbound/dist/validator/autotrust.c   Thu Aug 31 10:59:39 2017        
(r323047)
+++ vendor/unbound/dist/validator/autotrust.c   Thu Aug 31 11:43:21 2017        
(r323048)
@@ -1571,6 +1571,11 @@ key_matches_a_ds(struct module_env* env, struct val_en
                        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_en
                        verbose(VERB_ALGO, "DS match failed because the key "
                                "does not verify the keyset: %s", reason);
                }
+               */
        }
        return 0;
 }
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to