BTCPrivate
/
BitcoinPrivate-legacy
mirror of https://github.com/BTCPrivate/BitcoinPrivate-legacy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Auto merge of #1747 - str4d:fix-spendingkey-locking, r=str4d 

Fix incorrect locking in CCryptoKeyStore
This commit is contained in:
Homu 2017-06-15 16:02:07 -07:00
parent 35bf9e73ff 1749dd69c7
commit 6189c70caa
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/crypter.cpp
View File

@ -153,7 +153,7 @@ static bool DecryptSpendingKey(const CKeyingMaterial& vMasterKey,
bool CCryptoKeyStore::SetCrypted() bool CCryptoKeyStore::SetCrypted()
{ {
LOCK(cs_KeyStore); LOCK2(cs_KeyStore, cs_SpendingKeyStore);
if (fUseCrypto) if (fUseCrypto)
return true; return true;
if (!(mapKeys.empty() && mapSpendingKeys.empty())) if (!(mapKeys.empty() && mapSpendingKeys.empty()))
@ -179,7 +179,7 @@ bool CCryptoKeyStore::Lock()
bool CCryptoKeyStore::Unlock(const CKeyingMaterial& vMasterKeyIn) bool CCryptoKeyStore::Unlock(const CKeyingMaterial& vMasterKeyIn)
{ {
{ {
LOCK(cs_KeyStore); LOCK2(cs_KeyStore, cs_SpendingKeyStore);
if (!SetCrypted()) if (!SetCrypted())
return false; return false;

2
src/wallet/crypter.h
View File

@ -207,7 +207,7 @@ public:
bool HaveSpendingKey(const libzcash::PaymentAddress &address) const bool HaveSpendingKey(const libzcash::PaymentAddress &address) const
{ {
{ {
LOCK(cs_KeyStore); LOCK(cs_SpendingKeyStore);
if (!IsCrypted()) if (!IsCrypted())
return CBasicKeyStore::HaveSpendingKey(address); return CBasicKeyStore::HaveSpendingKey(address);
return mapCryptedSpendingKeys.count(address) > 0; return mapCryptedSpendingKeys.count(address) > 0;