zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'checkkeys' of https://github.com/sipa/bitcoin

This commit is contained in:
Gavin Andresen 2012-01-31 12:19:26 -05:00
parent 68649bef93 91f43a33f8
commit 4477b17f15
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/db.cpp
View File

@ -862,7 +862,7 @@ int CWalletDB::LoadWallet(CWallet* pwallet)
ssValue >> pkey; ssValue >> pkey;
key.SetPubKey(vchPubKey); key.SetPubKey(vchPubKey);
key.SetPrivKey(pkey); key.SetPrivKey(pkey);
if (key.GetPubKey() != vchPubKey) if (key.GetPubKey() != vchPubKey || !key.IsValid())
return DB_CORRUPT; return DB_CORRUPT;
} }
else else
@ -871,6 +871,8 @@ int CWalletDB::LoadWallet(CWallet* pwallet)
ssValue >> wkey; ssValue >> wkey;
key.SetPubKey(vchPubKey); key.SetPubKey(vchPubKey);
key.SetPrivKey(wkey.vchPrivKey); key.SetPrivKey(wkey.vchPrivKey);
if (key.GetPubKey() != vchPubKey || !key.IsValid())
return DB_CORRUPT;
} }
if (!pwallet->LoadKey(key)) if (!pwallet->LoadKey(key))
return DB_CORRUPT; return DB_CORRUPT;

12
src/key.h
View File

@ -307,6 +307,18 @@ public:
return false; return false;
return true; return true;
} }
bool IsValid()
{
if (!fSet)
return false;
bool fCompr;
CSecret secret = GetSecret(fCompr);
CKey key2;
key2.SetSecret(secret, fCompr);
return GetPubKey() == key2.GetPubKey();
}
}; };
#endif #endif