diff options
author | Andrew Chow <achow101-github@achow101.com> | 2019-12-05 18:02:01 -0500 |
---|---|---|
committer | Andrew Chow <achow101-github@achow101.com> | 2019-12-06 15:05:08 -0500 |
commit | e576b135d6451101d6a8219f55d80aefa216dc38 (patch) | |
tree | d989e10eff24459961a1d1c0d216b7b8b59436d4 /src | |
parent | fd9d6eebc1eabb4675a118d19d38283da2dead39 (diff) | |
download | bitcoin-e576b135d6451101d6a8219f55d80aefa216dc38.tar.xz |
Replace LegacyScriptPubKeyMan::vMasterKey with GetDecryptionKey()
Diffstat (limited to 'src')
-rw-r--r-- | src/wallet/scriptpubkeyman.cpp | 5 | ||||
-rw-r--r-- | src/wallet/scriptpubkeyman.h | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp index 2b9e8fbf2a..f9c2645ca9 100644 --- a/src/wallet/scriptpubkeyman.cpp +++ b/src/wallet/scriptpubkeyman.cpp @@ -594,7 +594,7 @@ bool LegacyScriptPubKeyMan::AddKeyPubKeyInner(const CKey& key, const CPubKey &pu std::vector<unsigned char> vchCryptedSecret; CKeyingMaterial vchSecret(key.begin(), key.end()); - if (!EncryptSecret(vMasterKey, vchSecret, pubkey.GetHash(), vchCryptedSecret)) { + if (!EncryptSecret(m_storage.GetEncryptionKey(), vchSecret, pubkey.GetHash(), vchCryptedSecret)) { return false; } @@ -759,7 +759,7 @@ bool LegacyScriptPubKeyMan::GetKey(const CKeyID &address, CKey& keyOut) const { const CPubKey &vchPubKey = (*mi).second.first; const std::vector<unsigned char> &vchCryptedSecret = (*mi).second.second; - return DecryptKey(vMasterKey, vchCryptedSecret, vchPubKey, keyOut); + return DecryptKey(m_storage.GetEncryptionKey(), vchCryptedSecret, vchPubKey, keyOut); } return false; } @@ -1398,7 +1398,6 @@ LegacyScriptPubKeyMan::LegacyScriptPubKeyMan(CWallet& wallet) : ScriptPubKeyMan(wallet), m_wallet(wallet), cs_wallet(wallet.cs_wallet), - vMasterKey(wallet.vMasterKey), fUseCrypto(wallet.fUseCrypto), fDecryptionThoroughlyChecked(wallet.fDecryptionThoroughlyChecked) {} diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h index d738418a69..daed5bd901 100644 --- a/src/wallet/scriptpubkeyman.h +++ b/src/wallet/scriptpubkeyman.h @@ -412,7 +412,6 @@ public: template<typename... Params> void WalletLogPrintf(const std::string& fmt, const Params&... parameters) const; CWallet& m_wallet; CCriticalSection& cs_wallet; - CKeyingMaterial& vMasterKey GUARDED_BY(cs_KeyStore); std::atomic<bool>& fUseCrypto; bool& fDecryptionThoroughlyChecked; }; |