Browse Source

Use CHashWriter also in SignatureHash(), and for message signing

pull/1/head
Pieter Wuille 10 years ago
parent
commit
8980a50924
  1. 8
      src/rpcwallet.cpp
  2. 5
      src/script.cpp

8
src/rpcwallet.cpp

@ -329,12 +329,12 @@ Value signmessage(const Array& params, bool fHelp) @@ -329,12 +329,12 @@ Value signmessage(const Array& params, bool fHelp)
if (!pwalletMain->GetKey(keyID, key))
throw JSONRPCError(RPC_WALLET_ERROR, "Private key not available");
CDataStream ss(SER_GETHASH, 0);
CHashWriter ss(SER_GETHASH, 0);
ss << strMessageMagic;
ss << strMessage;
vector<unsigned char> vchSig;
if (!key.SignCompact(Hash(ss.begin(), ss.end()), vchSig))
if (!key.SignCompact(ss.GetHash(), vchSig))
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Sign failed");
return EncodeBase64(&vchSig[0], vchSig.size());
@ -365,12 +365,12 @@ Value verifymessage(const Array& params, bool fHelp) @@ -365,12 +365,12 @@ Value verifymessage(const Array& params, bool fHelp)
if (fInvalid)
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Malformed base64 encoding");
CDataStream ss(SER_GETHASH, 0);
CHashWriter ss(SER_GETHASH, 0);
ss << strMessageMagic;
ss << strMessage;
CKey key;
if (!key.SetCompactSignature(Hash(ss.begin(), ss.end()), vchSig))
if (!key.SetCompactSignature(ss.GetHash(), vchSig))
return false;
return (key.GetPubKey().GetID() == keyID);

5
src/script.cpp

@ -1117,10 +1117,9 @@ uint256 SignatureHash(CScript scriptCode, const CTransaction& txTo, unsigned int @@ -1117,10 +1117,9 @@ uint256 SignatureHash(CScript scriptCode, const CTransaction& txTo, unsigned int
}
// Serialize and hash
CDataStream ss(SER_GETHASH, 0);
ss.reserve(10000);
CHashWriter ss(SER_GETHASH, 0);
ss << txTmp << nHashType;
return Hash(ss.begin(), ss.end());
return ss.GetHash();
}

Loading…
Cancel
Save