Merge pull request #2540 from sipa/nodosnocan

Do not invoke DoS for non-canonical sigs
2013-04-19 10:29:37 -07:00 · 2013-04-19 10:29:37 -07:00 · ce8de31fbf
parent 72782f3b92 97e7901a3a
commit ce8de31fbf
1 changed files with 9 additions and 1 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@ -1438,8 +1438,16 @@ bool CTransaction::CheckInputs(CValidationState &state, CCoinsViewCache &inputs,
                if (pvChecks) {
                    pvChecks->push_back(CScriptCheck());
                    check.swap(pvChecks->back());
-                } else if (!check())
+                } else if (!check()) {
+                    if (flags & SCRIPT_VERIFY_STRICTENC) {
+                        // For now, check whether the failure was caused by non-canonical
+                        // encodings or not; if so, don't trigger DoS protection.
+                        CScriptCheck check(coins, *this, i, flags & (~SCRIPT_VERIFY_STRICTENC), 0);
+                        if (check())
+                            return state.Invalid();
+                    }
                    return state.DoS(100,false);
+                }
            }
        }
    }