Do not invoke DoS for non-canonical sigs

sipa · sipa · commit 97e7901a3a74 · 2013-04-18T22:49:23.000+02:00
diff --git 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);
+                }
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1438,8 +1438,16 @@ bool CTransaction::CheckInputs(CValidationState &state, CCoinsViewCache &inputs,`
`1438`	`1438`	`if (pvChecks) {`
`1439`	`1439`	`pvChecks->push_back(CScriptCheck());`
`1440`	`1440`	`check.swap(pvChecks->back());`
`1441`		`- } else if (!check())`
	`1441`	`+ } else if (!check()) {`
	`1442`	`+ if (flags & SCRIPT_VERIFY_STRICTENC) {`
	`1443`	`+ // For now, check whether the failure was caused by non-canonical`
	`1444`	`+ // encodings or not; if so, don't trigger DoS protection.`
	`1445`	`+ CScriptCheck check(coins, *this, i, flags & (~SCRIPT_VERIFY_STRICTENC), 0);`
	`1446`	`+ if (check())`
	`1447`	`+ return state.Invalid();`
	`1448`	`+ }`
`1442`	`1449`	`return state.DoS(100,false);`
	`1450`	`+ }`
`1443`	`1451`	`}`
`1444`	`1452`	`}`
`1445`	`1453`	`}`