Merge commit '882903f2fa800c4cb6f5e225b728e2887bb7b9ae'

diff --cc services/authzone.c
Simple merge

diff --cc validator/val_sigcrypt.c
index f169c64fbf0320a87b011cdca4196794297fc649,f4b866366f3c73da10064d135ce92ef84d2ed606..7c2b9d7e660811b3ddd0fd94ff0d7767eb542be5
--- 1/validator/val_sigcrypt.c
--- 2/validator/val_sigcrypt.c
+++ b/validator/val_sigcrypt.c
@@@ -714,9 -737,18 +737,17 @@@ dnskey_verify_rrset(struct module_env* 
                if(sec == sec_status_secure)
                        return sec;
                numchecked ++;
+               numverified ++;
                if(sec == sec_status_indeterminate)
                        numindeterminate ++;
+               if(numverified > MAX_VALIDATE_RRSIGS) {
+                       verbose(VERB_QUERY, "rrset failed to verify, too many RRSIG validations");
+                       *reason = "too many RRSIG validations";
+                       if(reason_bogus)
+                               *reason_bogus = LDNS_EDE_DNSSEC_BOGUS;
+                       return sec_status_bogus;
+               }
        }
 -      verbose(VERB_ALGO, "rrset failed to verify: all signatures are bogus");
        if(!numchecked) {
                *reason = "signature for expected key and algorithm missing";
                if(reason_bogus)

diff --cc validator/val_utils.c
Simple merge