Merge branch 'checkkeys' of https://github.com/sipa/bitcoin
This commit is contained in:
commit
4477b17f15
2 changed files with 15 additions and 1 deletions
|
@ -862,7 +862,7 @@ int CWalletDB::LoadWallet(CWallet* pwallet)
|
|||
ssValue >> pkey;
|
||||
key.SetPubKey(vchPubKey);
|
||||
key.SetPrivKey(pkey);
|
||||
if (key.GetPubKey() != vchPubKey)
|
||||
if (key.GetPubKey() != vchPubKey || !key.IsValid())
|
||||
return DB_CORRUPT;
|
||||
}
|
||||
else
|
||||
|
@ -871,6 +871,8 @@ int CWalletDB::LoadWallet(CWallet* pwallet)
|
|||
ssValue >> wkey;
|
||||
key.SetPubKey(vchPubKey);
|
||||
key.SetPrivKey(wkey.vchPrivKey);
|
||||
if (key.GetPubKey() != vchPubKey || !key.IsValid())
|
||||
return DB_CORRUPT;
|
||||
}
|
||||
if (!pwallet->LoadKey(key))
|
||||
return DB_CORRUPT;
|
||||
|
|
12
src/key.h
12
src/key.h
|
@ -307,6 +307,18 @@ public:
|
|||
return false;
|
||||
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
|
||||
|
|
Loading…
Reference in a new issue