aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2014-09-08 15:13:46 +0200
committerPieter Wuille <pieter.wuille@gmail.com>2014-09-08 15:13:55 +0200
commitdf623d83dad6aa39141b066ebd2f870ee05acf41 (patch)
treefaf9f76a9eb2b0fafd924daa8ce54f5f683c08c1
parentbb4ef1e9dc99bbe4b7f1cd5be741c8a8b5113b8a (diff)
parent8e44f2e00a14e1d12f898ae54f77e9de228d206f (diff)
downloadbitcoin-df623d83dad6aa39141b066ebd2f870ee05acf41.tar.xz
Merge pull request #4865
8e44f2e Clarify 'compressed nor uncompressed' error message (Peter Todd)
-rw-r--r--src/script.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script.cpp b/src/script.cpp
index 06a0a5decf..f3d423a424 100644
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -238,7 +238,7 @@ bool IsCanonicalPubKey(const valtype &vchPubKey, unsigned int flags) {
if (vchPubKey.size() != 33)
return error("Non-canonical public key: invalid length for compressed key");
} else {
- return error("Non-canonical public key: compressed nor uncompressed");
+ return error("Non-canonical public key: neither compressed nor uncompressed");
}
return true;
}