diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-11-04 08:58:43 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-11-04 09:26:45 +0100 |
| commit | 73b82a30892224b17aa1b9db9b6de4eeeb903b7f (patch) | |
| tree | 0416c14ba1e546a85abc8ab71320bd3f6e5a62c7 /src/script | |
| parent | ff17816abf2d2be2b349c4ba4d49633a126074fa (diff) | |
| parent | d2e74c55bdd8cee6a0cca49aca0e2ab1a182c9b5 (diff) | |
| download | bitcoin-73b82a30892224b17aa1b9db9b6de4eeeb903b7f.tar.xz | |
Merge pull request #5162
d2e74c5 boost: moveonly: split CPubKey and friends to new files (Cory Fields)
78c228c boost: moveonly: move BIP32Hash to hash.h (Cory Fields)
900078a boost: moveonly: create eccryptoverify.h|cpp and move helper functions there (Cory Fields)
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/interpreter.cpp | 5 | ||||
| -rw-r--r-- | src/script/sigcache.cpp | 2 | ||||
| -rw-r--r-- | src/script/standard.cpp | 1 | ||||
| -rw-r--r-- | src/script/standard.h | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index 3625972ebf..54c2847f79 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -9,7 +9,8 @@ #include "crypto/ripemd160.h" #include "crypto/sha1.h" #include "crypto/sha2.h" -#include "key.h" +#include "eccryptoverify.h" +#include "pubkey.h" #include "script/script.h" #include "uint256.h" #include "util.h" @@ -122,7 +123,7 @@ bool static IsLowDERSignature(const valtype &vchSig) { // If the S value is above the order of the curve divided by two, its // complement modulo the order could have been used instead, which is // one byte shorter when encoded correctly. - if (!CKey::CheckSignatureElement(S, nLenS, true)) + if (!eccrypto::CheckSignatureElement(S, nLenS, true)) return error("Non-canonical signature: S value is unnecessarily high"); return true; diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp index ab366898d8..d76a5acd63 100644 --- a/src/script/sigcache.cpp +++ b/src/script/sigcache.cpp @@ -5,7 +5,7 @@ #include "sigcache.h" -#include "key.h" +#include "pubkey.h" #include "random.h" #include "uint256.h" #include "util.h" diff --git a/src/script/standard.cpp b/src/script/standard.cpp index 7356e541a6..e238ecedb0 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -5,6 +5,7 @@ #include "script/standard.h" +#include "pubkey.h" #include "script/script.h" #include "util.h" #include "utilstrencodings.h" diff --git a/src/script/standard.h b/src/script/standard.h index 504d98c686..7d480cd560 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -6,8 +6,7 @@ #ifndef H_BITCOIN_SCRIPT_STANDARD #define H_BITCOIN_SCRIPT_STANDARD -#include "key.h" -#include "script/script.h" +#include "uint256.h" #include "script/interpreter.h" #include <boost/variant.hpp> @@ -15,6 +14,7 @@ #include <stdint.h> class CScript; +class CKeyID; /** A reference to a CScript: the Hash160 of its serialization (see script.h) */ class CScriptID : public uint160 |