diff options
| author | Andrew Chow <achow101-github@achow101.com> | 2017-07-28 17:00:49 -0700 |
|---|---|---|
| committer | Andrew Chow <achow101-github@achow101.com> | 2017-08-15 15:05:53 -0700 |
| commit | e53615b443894fb96d5eb885b3812776c1b1033b (patch) | |
| tree | c2f5789ec8e1a840161d58698f9014c81e3b24d3 /src/wallet/crypter.h | |
| parent | ae47724687a78572daba5bc113d99d03b7ab01d6 (diff) | |
| download | bitcoin-e53615b443894fb96d5eb885b3812776c1b1033b.tar.xz | |
Remove vchDefaultKey and have better first run detection
Removes vchDefaultKey which was only used for first run detection.
Improves wallet first run detection by checking to see if any keys
were read from the database.
This will now also check for a valid defaultkey for backwards
compatibility reasons and to check for any corruption.
Keys will stil be generated on the first one, but there won't be
any shown in the address book as was previously done.
Diffstat (limited to 'src/wallet/crypter.h')
| -rw-r--r-- | src/wallet/crypter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/crypter.h b/src/wallet/crypter.h index 1dc44e424f..f1e8a25650 100644 --- a/src/wallet/crypter.h +++ b/src/wallet/crypter.h @@ -113,7 +113,6 @@ public: class CCryptoKeyStore : public CBasicKeyStore { private: - CryptedKeyMap mapCryptedKeys; CKeyingMaterial vMasterKey; @@ -131,6 +130,7 @@ protected: bool EncryptKeys(CKeyingMaterial& vMasterKeyIn); bool Unlock(const CKeyingMaterial& vMasterKeyIn); + CryptedKeyMap mapCryptedKeys; public: CCryptoKeyStore() : fUseCrypto(false), fDecryptionThoroughlyChecked(false) |