diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-11-21 14:14:36 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-11-21 14:21:56 +0100 |
| commit | ca6fb4e885c899e297e0a6fa723604a41f199aa6 (patch) | |
| tree | 8440a612e083244a40bf0ba200cefa261ff762f6 /src/script/script_error.cpp | |
| parent | Merge pull request #5318 (diff) | |
| parent | Test the exact order of CHECKMULTISIG sig/pubkey evaluation (diff) | |
| download | discoin-ca6fb4e885c899e297e0a6fa723604a41f199aa6.tar.xz discoin-ca6fb4e885c899e297e0a6fa723604a41f199aa6.zip | |
Merge pull request #5247
ca81587 Test the exact order of CHECKMULTISIG sig/pubkey evaluation (Peter Todd)
98b135f Make STRICTENC invalid pubkeys fail the script rather than the opcode. (Pieter Wuille)
Diffstat (limited to 'src/script/script_error.cpp')
| -rw-r--r-- | src/script/script_error.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/script/script_error.cpp b/src/script/script_error.cpp index 793fc0da4..5d24ed98b 100644 --- a/src/script/script_error.cpp +++ b/src/script/script_error.cpp @@ -61,6 +61,8 @@ const char* ScriptErrorString(const ScriptError serror) return "Dummy CHECKMULTISIG argument must be zero"; case SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS: return "NOPx reserved for soft-fork upgrades"; + case SCRIPT_ERR_PUBKEYTYPE: + return "Public key is neither compressed or uncompressed"; case SCRIPT_ERR_UNKNOWN_ERROR: case SCRIPT_ERR_ERROR_COUNT: default: break; |