Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-23 14:27:28 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6446

Browse source 
e509ede trezor: adapt to new passphrase mechanism (ph4r05)
This commit is contained in:
luigi1111 2020-05-01 15:32:52 -05:00
commit c9b800a787
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
24 changed files with 434 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/wallet/wallet2.cpp
View file

@ -1109,10 +1109,12 @@ boost::optional<epee::wipeable_string> wallet_device_callback::on_pin_request()
return boost::none;
}
boost::optional<epee::wipeable_string> wallet_device_callback::on_passphrase_request(bool on_device)
boost::optional<epee::wipeable_string> wallet_device_callback::on_passphrase_request(bool & on_device)
{
if (wallet)
return wallet->on_device_passphrase_request(on_device);
else
on_device = true;
return boost::none;
}
@ -13618,10 +13620,12 @@ boost::optional<epee::wipeable_string> wallet2::on_device_pin_request()
return boost::none;
}
//----------------------------------------------------------------------------------------------------
boost::optional<epee::wipeable_string> wallet2::on_device_passphrase_request(bool on_device)
boost::optional<epee::wipeable_string> wallet2::on_device_passphrase_request(bool & on_device)
{
if (nullptr != m_callback)
return m_callback->on_device_passphrase_request(on_device);
else
on_device = true;
return boost::none;
}
//----------------------------------------------------------------------------------------------------