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 #7335

Browse Source 
8d03bb6 device_trezor: add redundant check (anon)
34f9428 device_trezor: wipe string fields properly (anon)
This commit is contained in:
luigi1111 2021-03-05 13:52:01 -05:00
commit e01894672b
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/device_trezor/device_trezor_base.cpp
View File

@ -365,15 +365,14 @@ namespace trezor {
void device_trezor_base::device_state_initialize_unsafe() void device_trezor_base::device_state_initialize_unsafe()
{ {
require_connected(); require_connected();
std::string tmp_session_id;
auto initMsg = std::make_shared<messages::management::Initialize>(); auto initMsg = std::make_shared<messages::management::Initialize>();
const auto data_cleaner = epee::misc_utils::create_scope_leave_handler([&]() { const auto data_cleaner = epee::misc_utils::create_scope_leave_handler([&]() {
memwipe(&tmp_session_id[0], tmp_session_id.size()); if (initMsg->has_session_id())
memwipe(&(*initMsg->mutable_session_id())[0], initMsg->mutable_session_id()->size());
}); });
if(!m_device_session_id.empty()) { if(!m_device_session_id.empty()) {
tmp_session_id.assign(m_device_session_id.data(), m_device_session_id.size()); initMsg->set_allocated_session_id(new std::string(m_device_session_id.data(), m_device_session_id.size()));
initMsg->set_allocated_session_id(&tmp_session_id);
} }
m_features = this->client_exchange<messages::management::Features>(initMsg); m_features = this->client_exchange<messages::management::Features>(initMsg);
@ -382,8 +381,6 @@ namespace trezor {
} else { } else {
m_device_session_id.clear(); m_device_session_id.clear();
} }
initMsg->release_session_id();
} }
void device_trezor_base::device_state_reset() void device_trezor_base::device_state_reset()
@ -453,18 +450,14 @@ namespace trezor {
pin = m_pin; pin = m_pin;
} }
std::string pin_field;
messages::common::PinMatrixAck m; messages::common::PinMatrixAck m;
if (pin) { if (pin) {
pin_field.assign(pin->data(), pin->size()); m.set_allocated_pin(new std::string(pin->data(), pin->size()));
m.set_allocated_pin(&pin_field);
} }
const auto data_cleaner = epee::misc_utils::create_scope_leave_handler([&]() { const auto data_cleaner = epee::misc_utils::create_scope_leave_handler([&]() {
m.release_pin(); if (m.has_pin())
if (!pin_field.empty()){ memwipe(&(*m.mutable_pin())[0], m.mutable_pin()->size());
memwipe(&pin_field[0], pin_field.size());
}
}); });
resp = call_raw(&m); resp = call_raw(&m);
@ -499,7 +492,6 @@ namespace trezor {
boost::optional<epee::wipeable_string> passphrase; boost::optional<epee::wipeable_string> passphrase;
TREZOR_CALLBACK_GET(passphrase, on_passphrase_request, on_device); TREZOR_CALLBACK_GET(passphrase, on_passphrase_request, on_device);
std::string passphrase_field;
messages::common::PassphraseAck m; messages::common::PassphraseAck m;
m.set_on_device(on_device); m.set_on_device(on_device);
if (!on_device) { if (!on_device) {
@ -512,16 +504,13 @@ namespace trezor {
} }
if (passphrase) { if (passphrase) {
passphrase_field.assign(passphrase->data(), passphrase->size()); m.set_allocated_passphrase(new std::string(passphrase->data(), passphrase->size()));
m.set_allocated_passphrase(&passphrase_field);
} }
} }
const auto data_cleaner = epee::misc_utils::create_scope_leave_handler([&]() { const auto data_cleaner = epee::misc_utils::create_scope_leave_handler([&]() {
m.release_passphrase(); if (m.has_passphrase())
if (!passphrase_field.empty()){ memwipe(&(m.mutable_passphrase())[0], m.mutable_passphrase()->size());
memwipe(&passphrase_field[0], passphrase_field.size());
}
}); });
resp = call_raw(&m); resp = call_raw(&m);

2
src/device_trezor/device_trezor_base.hpp
View File

@ -165,7 +165,7 @@ namespace trezor {
// Scoped session closer // Scoped session closer
BOOST_SCOPE_EXIT_ALL(&, this) { BOOST_SCOPE_EXIT_ALL(&, this) {
if (open_session){ if (open_session && this->get_transport()){
this->get_transport()->close(); this->get_transport()->close();
} }
}; };