nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6238

Browse Source 
f717d593 wallet2: guard against race with multiple decrypt_keys users (moneromooo-monero)
This commit is contained in:
Alexander Blair 2020-02-28 20:20:41 -08:00
commit da617ac1b0
No known key found for this signature in database
GPG Key ID: C64552D877C32479
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wallet/wallet2.cpp
View File

@ -1186,6 +1186,7 @@ wallet2::wallet2(network_type nettype, uint64_t kdf_rounds, bool unattended):
m_ringdb(), m_ringdb(),
m_last_block_reward(0), m_last_block_reward(0),
m_encrypt_keys_after_refresh(boost::none), m_encrypt_keys_after_refresh(boost::none),
m_decrypt_keys_lockers(0),
m_unattended(unattended), m_unattended(unattended),
m_devices_registered(false), m_devices_registered(false),
m_device_last_key_image_sync(0), m_device_last_key_image_sync(0),
@ -4371,12 +4372,18 @@ bool wallet2::verify_password(const std::string& keys_file_name, const epee::wip
void wallet2::encrypt_keys(const crypto::chacha_key &key) void wallet2::encrypt_keys(const crypto::chacha_key &key)
{ {
boost::lock_guard<boost::mutex> lock(m_decrypt_keys_lock);
if (--m_decrypt_keys_lockers) // another lock left ?
return;
m_account.encrypt_keys(key); m_account.encrypt_keys(key);
m_account.decrypt_viewkey(key); m_account.decrypt_viewkey(key);
} }
void wallet2::decrypt_keys(const crypto::chacha_key &key) void wallet2::decrypt_keys(const crypto::chacha_key &key)
{ {
boost::lock_guard<boost::mutex> lock(m_decrypt_keys_lock);
if (m_decrypt_keys_lockers++) // already unlocked ?
return;
m_account.encrypt_viewkey(key); m_account.encrypt_viewkey(key);
m_account.decrypt_keys(key); m_account.decrypt_keys(key);
} }

2
src/wallet/wallet2.h
View File

@ -1618,6 +1618,8 @@ private:
crypto::chacha_key m_cache_key; crypto::chacha_key m_cache_key;
boost::optional<epee::wipeable_string> m_encrypt_keys_after_refresh; boost::optional<epee::wipeable_string> m_encrypt_keys_after_refresh;
boost::mutex m_decrypt_keys_lock;
unsigned int m_decrypt_keys_lockers;
bool m_unattended; bool m_unattended;
bool m_devices_registered; bool m_devices_registered;