diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2021-10-19 19:34:33 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2021-10-19 22:01:45 +0000 |
| commit | 2cad56306059d911f43de39f61e87508840f3c89 (patch) | |
| tree | f744f09cfa2f16a0834f9ef610511059a0eb6747 /src/wallet/wallet2.h | |
| parent | Merge pull request #8001 (diff) | |
| download | monero-2cad56306059d911f43de39f61e87508840f3c89.tar.xz | |
wallet2: fix key encryption when changing ask-password from 0/1 to 2
we reuse the wallet_keys_unlocker object, which does the right thing
in conjunction with other users of decrypt/encrypt (ie, refresh).
Diffstat (limited to '')
| -rw-r--r-- | src/wallet/wallet2.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index facf9878d..7648becc8 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -1798,9 +1798,7 @@ private: crypto::secret_key m_original_view_secret_key; crypto::chacha_key m_cache_key; - boost::optional<epee::wipeable_string> m_encrypt_keys_after_refresh; - boost::mutex m_decrypt_keys_lock; - unsigned int m_decrypt_keys_lockers; + std::shared_ptr<wallet_keys_unlocker> m_encrypt_keys_after_refresh; bool m_unattended; bool m_devices_registered; |