Merge pull request #660 from InfrastructureServices/sha1-runtime-insecure

Sha1 runtime insecure

diff --cc validator/val_secalgo.c
Simple merge

diff --cc validator/val_sigcrypt.c
index d5f16b11f819af6c2b155235774cf9e4df0c2a98,fb8bbb9117de8adaf94a4a9a31f1b35b55901196..5fd774d7a44c12c51c7e23d8a28d861f78fb8725
--- 1/validator/val_sigcrypt.c
--- 2/validator/val_sigcrypt.c
+++ b/validator/val_sigcrypt.c
@@@ -610,11 -597,11 +610,11 @@@ void algo_needs_reason(struct module_en
  enum sec_status 
  dnskey_verify_rrset(struct module_env* env, struct val_env* ve,
          struct ub_packed_rrset_key* rrset, struct ub_packed_rrset_key* dnskey,
 -      size_t dnskey_idx, char** reason, sldns_pkt_section section,
 -      struct module_qstate* qstate)
 +      size_t dnskey_idx, char** reason, sldns_ede_code *reason_bogus,
 +      sldns_pkt_section section, struct module_qstate* qstate)
  {
        enum sec_status sec;
-       size_t i, num, numchecked = 0;
+       size_t i, num, numchecked = 0, numindeterminate = 0;
        rbtree_type* sortree = NULL;
        int buf_canon = 0;
        uint16_t tag = dnskey_calc_keytag(dnskey, dnskey_idx);
@@@ -679,12 -669,13 +687,14 @@@ dnskeyset_verify_rrset_sig(struct modul
                numchecked ++;
  
                /* see if key verifies */
 -              sec = dnskey_verify_rrset_sig(env->scratch, 
 -                      env->scratch_buffer, ve, now, rrset, dnskey, i, 
 -                      sig_idx, sortree, &buf_canon, reason, section, qstate);
 +              sec = dnskey_verify_rrset_sig(env->scratch,
 +                      env->scratch_buffer, ve, now, rrset, dnskey, i,
 +                      sig_idx, sortree, &buf_canon, reason, reason_bogus,
 +                      section, qstate);
                if(sec == sec_status_secure)
                        return sec;
+               else if(sec == sec_status_indeterminate)
+                       numindeterminate ++;
        }
        if(numchecked == 0) {
                *reason = "signatures from unknown keys";

diff --cc validator/val_utils.c
Simple merge