zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Dont run full check every time we decrypt wallet.

This commit is contained in:
Matt Corallo 2014-08-09 18:49:07 -07:00
parent 1e21c17d20
commit a35b55b522
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/crypter.cpp
View File

@ -178,6 +178,8 @@ bool CCryptoKeyStore::Unlock(const CKeyingMaterial& vMasterKeyIn)
break; break;
} }
keyPass = true; keyPass = true;
if (fDecryptionThoroughlyChecked)
break;
} }
if (keyPass && keyFail) if (keyPass && keyFail)
{ {
@ -187,6 +189,7 @@ bool CCryptoKeyStore::Unlock(const CKeyingMaterial& vMasterKeyIn)
if (keyFail || !keyPass) if (keyFail || !keyPass)
return false; return false;
vMasterKey = vMasterKeyIn; vMasterKey = vMasterKeyIn;
fDecryptionThoroughlyChecked = true;
} }
NotifyStatusChanged(this); NotifyStatusChanged(this);
return true; return true;

5
src/crypter.h
View File

@ -121,6 +121,9 @@ private:
// if fUseCrypto is false, vMasterKey must be empty // if fUseCrypto is false, vMasterKey must be empty
bool fUseCrypto; bool fUseCrypto;
// keeps track of whether Unlock has run a thourough check before
bool fDecryptionThoroughlyChecked;
protected: protected:
bool SetCrypted(); bool SetCrypted();
@ -130,7 +133,7 @@ protected:
bool Unlock(const CKeyingMaterial& vMasterKeyIn); bool Unlock(const CKeyingMaterial& vMasterKeyIn);
public: public:
CCryptoKeyStore() : fUseCrypto(false) CCryptoKeyStore() : fUseCrypto(false), fDecryptionThoroughlyChecked(false)
{ {
} }