highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-18 22:35:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not use obsolete CPrivKey for passing keys around

Browse Source
This commit is contained in:
Pieter Wuille
2011-07-03 15:33:01 +02:00
committed by Matt Corallo
parent b6b039d84e
commit 0efda1a79e
4 changed files with 12 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/script.cpp
View File

@@ -1038,13 +1038,13 @@ bool Solver(const CKeyStore& keystore, const CScript& scriptPubKey, uint256 hash
{
// Sign
const valtype& vchPubKey = item.second;
CPrivKey privkey;
if (!keystore.GetPrivKey(vchPubKey, privkey))
CKey key;
if (!keystore.GetPrivKey(vchPubKey, key))
return false;
if (hash != 0)
{
vector<unsigned char> vchSig;
if (!CKey::Sign(privkey, hash, vchSig))
if (!key.Sign(hash, vchSig))
return false;
vchSig.push_back((unsigned char)nHashType);
scriptSigRet << vchSig;
@@ -1057,13 +1057,13 @@ bool Solver(const CKeyStore& keystore, const CScript& scriptPubKey, uint256 hash
if (mi == mapPubKeys.end())
return false;
const vector<unsigned char>& vchPubKey = (*mi).second;
CPrivKey privkey;
if (!keystore.GetPrivKey(vchPubKey, privkey))
CKey key;
if (!keystore.GetPrivKey(vchPubKey, key))
return false;
if (hash != 0)
{
vector<unsigned char> vchSig;
if (!CKey::Sign(privkey, hash, vchSig))
if (!key.Sign(hash, vchSig))
return false;
vchSig.push_back((unsigned char)nHashType);
scriptSigRet << vchSig << vchPubKey;