diff options
| author | Johnson Lau <[email protected]> | 2018-04-27 03:56:29 +0800 |
|---|---|---|
| committer | Johnson Lau <[email protected]> | 2018-05-05 04:26:12 +0800 |
| commit | 9dabfe49c066301ef75bcfcb089fd308366127c4 (patch) | |
| tree | 9640b1303dc21c3dc68463833d9f34145a118b2e /src/script/script_error.cpp | |
| parent | Merge #13165: doc: Mention good first issue list in CONTRIBUTING.md (diff) | |
| download | discoin-9dabfe49c066301ef75bcfcb089fd308366127c4.tar.xz discoin-9dabfe49c066301ef75bcfcb089fd308366127c4.zip | |
Add constant scriptCode policy in non-segwit scripts
This disables OP_CODESEPARATOR in non-segwit scripts (even in an unexecuted branch), and makes a positive FindAndDelete result invalid. This ensures that the scriptCode serialized in SignatureHash() is always the same as the script passing to the EvalScript.
Diffstat (limited to 'src/script/script_error.cpp')
| -rw-r--r-- | src/script/script_error.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/script/script_error.cpp b/src/script/script_error.cpp index dbceb1f74..ceda74058 100644 --- a/src/script/script_error.cpp +++ b/src/script/script_error.cpp @@ -89,6 +89,10 @@ const char* ScriptErrorString(const ScriptError serror) return "Witness provided for non-witness script"; case SCRIPT_ERR_WITNESS_PUBKEYTYPE: return "Using non-compressed keys in segwit"; + case SCRIPT_ERR_OP_CODESEPARATOR: + return "Using OP_CODESEPARATOR in non-witness script"; + case SCRIPT_ERR_SIG_FINDANDDELETE: + return "Signature is found in scriptCode"; case SCRIPT_ERR_UNKNOWN_ERROR: case SCRIPT_ERR_ERROR_COUNT: default: break; |