From e509ede2aa7263cc49d3378bc8c833a62300211d Mon Sep 17 00:00:00 2001 From: Dusan Klinec Date: Tue, 7 Apr 2020 18:25:25 +0200 Subject: trezor: adapt to new passphrase mechanism - choice where to enter passphrase is now made on the host - use wipeable string in the comm stack - wipe passphrase memory - protocol optimizations, prepare for new firmware version - minor fixes and improvements - tests fixes, HF12 support --- src/wallet/wallet2.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/wallet/wallet2.cpp') diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index bc8219c69..5935d954f 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -1109,10 +1109,12 @@ boost::optional wallet_device_callback::on_pin_request() return boost::none; } -boost::optional wallet_device_callback::on_passphrase_request(bool on_device) +boost::optional 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; } @@ -13547,10 +13549,12 @@ boost::optional wallet2::on_device_pin_request() return boost::none; } //---------------------------------------------------------------------------------------------------- -boost::optional wallet2::on_device_passphrase_request(bool on_device) +boost::optional 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; } //---------------------------------------------------------------------------------------------------- -- cgit v1.2.3