Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6057

Browse Source 
3b8dcc2 wallet2: make keys unlocker reentrant (moneromooo-monero)
This commit is contained in:
luigi1111 2019-12-12 13:49:58 -06:00
commit b4e1dc83d2
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/wallet/wallet2.cpp
View File

@ -1038,10 +1038,15 @@ uint64_t gamma_picker::pick()
return first_rct + crypto::rand_idx(n_rct); return first_rct + crypto::rand_idx(n_rct);
}; };
boost::mutex wallet_keys_unlocker::lockers_lock;
unsigned int wallet_keys_unlocker::lockers = 0;
wallet_keys_unlocker::wallet_keys_unlocker(wallet2 &w, const boost::optional<tools::password_container> &password): wallet_keys_unlocker::wallet_keys_unlocker(wallet2 &w, const boost::optional<tools::password_container> &password):
w(w), w(w),
locked(password != boost::none) locked(password != boost::none)
{ {
boost::lock_guard<boost::mutex> lock(lockers_lock);
if (lockers++ > 0)
locked = false;
if (!locked || w.is_unattended() || w.ask_password() != tools::wallet2::AskPasswordToDecrypt || w.watch_only()) if (!locked || w.is_unattended() || w.ask_password() != tools::wallet2::AskPasswordToDecrypt || w.watch_only())
{ {
locked = false; locked = false;
@ -1056,6 +1061,9 @@ wallet_keys_unlocker::wallet_keys_unlocker(wallet2 &w, bool locked, const epee::
w(w), w(w),
locked(locked) locked(locked)
{ {
boost::lock_guard<boost::mutex> lock(lockers_lock);
if (lockers++ > 0)
locked = false;
if (!locked) if (!locked)
return; return;
w.generate_chacha_key_from_password(password, key); w.generate_chacha_key_from_password(password, key);
@ -1064,9 +1072,19 @@ wallet_keys_unlocker::wallet_keys_unlocker(wallet2 &w, bool locked, const epee::
wallet_keys_unlocker::~wallet_keys_unlocker() wallet_keys_unlocker::~wallet_keys_unlocker()
{ {
if (!locked) try
return; {
try { w.encrypt_keys(key); } boost::lock_guard<boost::mutex> lock(lockers_lock);
if (lockers == 0)
{
MERROR("There are no lockers in wallet_keys_unlocker dtor");
return;
}
--lockers;
if (!locked)
return;
w.encrypt_keys(key);
}
catch (...) catch (...)
{ {
MERROR("Failed to re-encrypt wallet keys"); MERROR("Failed to re-encrypt wallet keys");

2
src/wallet/wallet2.h
View File

@ -122,6 +122,8 @@ private:
wallet2 &w; wallet2 &w;
bool locked; bool locked;
crypto::chacha_key key; crypto::chacha_key key;
static boost::mutex lockers_lock;
static unsigned int lockers;
}; };
class i_wallet2_callback class i_wallet2_callback