rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-10 13:13:27 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

wallet: use wipeable_string in more places where a secret is used

Browse Source
This commit is contained in:
moneromooo-monero 2018-08-27 08:44:15 +00:00
parent 07ec748c82
commit 56b50faab2
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
2 changed files with 42 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/simplewallet/simplewallet.cpp
View File

@ -2943,20 +2943,19 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
} }
// parse view secret key // parse view secret key
std::string viewkey_string = input_line("View key: "); epee::wipeable_string viewkey_string = input_secure_line("Secret view key: ");
if (std::cin.eof()) if (std::cin.eof())
return false; return false;
if (viewkey_string.empty()) { if (viewkey_string.empty()) {
fail_msg_writer() << tr("No data supplied, cancelled"); fail_msg_writer() << tr("No data supplied, cancelled");
return false; return false;
} }
cryptonote::blobdata viewkey_data; crypto::secret_key viewkey;
if(!epee::string_tools::parse_hexstr_to_binbuff(viewkey_string, viewkey_data) || viewkey_data.size() != sizeof(crypto::secret_key)) if (viewkey_string.hex_to_pod(unwrap(unwrap(viewkey))))
{ {
fail_msg_writer() << tr("failed to parse view key secret key"); fail_msg_writer() << tr("failed to parse view key secret key");
return false; return false;
} }
crypto::secret_key viewkey = *reinterpret_cast<const crypto::secret_key*>(viewkey_data.data());
m_wallet_file=m_generate_from_view_key; m_wallet_file=m_generate_from_view_key;
@ -2979,14 +2978,14 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
{ {
m_wallet_file = m_generate_from_spend_key; m_wallet_file = m_generate_from_spend_key;
// parse spend secret key // parse spend secret key
std::string spendkey_string = input_line("Secret spend key: "); epee::wipeable_string spendkey_string = input_secure_line("Secret spend key: ");
if (std::cin.eof()) if (std::cin.eof())
return false; return false;
if (spendkey_string.empty()) { if (spendkey_string.empty()) {
fail_msg_writer() << tr("No data supplied, cancelled"); fail_msg_writer() << tr("No data supplied, cancelled");
return false; return false;
} }
if (!epee::string_tools::hex_to_pod(spendkey_string, m_recovery_key)) if (!spendkey_string.hex_to_pod(unwrap(unwrap(m_recovery_key))))
{ {
fail_msg_writer() << tr("failed to parse spend key secret key"); fail_msg_writer() << tr("failed to parse spend key secret key");
return false; return false;
@ -3019,36 +3018,34 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
} }
// parse spend secret key // parse spend secret key
std::string spendkey_string = input_line("Secret spend key: "); epee::wipeable_string spendkey_string = input_secure_line("Secret spend key: ");
if (std::cin.eof()) if (std::cin.eof())
return false; return false;
if (spendkey_string.empty()) { if (spendkey_string.empty()) {
fail_msg_writer() << tr("No data supplied, cancelled"); fail_msg_writer() << tr("No data supplied, cancelled");
return false; return false;
} }
cryptonote::blobdata spendkey_data; crypto::secret_key spendkey;
if(!epee::string_tools::parse_hexstr_to_binbuff(spendkey_string, spendkey_data) || spendkey_data.size() != sizeof(crypto::secret_key)) if (!spendkey_string.hex_to_pod(unwrap(unwrap(spendkey))))
{ {
fail_msg_writer() << tr("failed to parse spend key secret key"); fail_msg_writer() << tr("failed to parse spend key secret key");
return false; return false;
} }
crypto::secret_key spendkey = *reinterpret_cast<const crypto::secret_key*>(spendkey_data.data());
// parse view secret key // parse view secret key
std::string viewkey_string = input_line("Secret view key: "); epee::wipeable_string viewkey_string = input_secure_line("Secret view key: ");
if (std::cin.eof()) if (std::cin.eof())
return false; return false;
if (viewkey_string.empty()) { if (viewkey_string.empty()) {
fail_msg_writer() << tr("No data supplied, cancelled"); fail_msg_writer() << tr("No data supplied, cancelled");
return false; return false;
} }
cryptonote::blobdata viewkey_data; crypto::secret_key viewkey;
if(!epee::string_tools::parse_hexstr_to_binbuff(viewkey_string, viewkey_data) || viewkey_data.size() != sizeof(crypto::secret_key)) if(!viewkey_string.hex_to_pod(unwrap(unwrap(viewkey))))
{ {
fail_msg_writer() << tr("failed to parse view key secret key"); fail_msg_writer() << tr("failed to parse view key secret key");
return false; return false;
} }
crypto::secret_key viewkey = *reinterpret_cast<const crypto::secret_key*>(viewkey_data.data());
m_wallet_file=m_generate_from_keys; m_wallet_file=m_generate_from_keys;
@ -3124,7 +3121,7 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
} }
// parse secret view key // parse secret view key
std::string viewkey_string = input_line("Secret view key: "); epee::wipeable_string viewkey_string = input_secure_line("Secret view key: ");
if (std::cin.eof()) if (std::cin.eof())
return false; return false;
if (viewkey_string.empty()) if (viewkey_string.empty())
@ -3132,13 +3129,12 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
fail_msg_writer() << tr("No data supplied, cancelled"); fail_msg_writer() << tr("No data supplied, cancelled");
return false; return false;
} }
cryptonote::blobdata viewkey_data; crypto::secret_key viewkey;
if(!epee::string_tools::parse_hexstr_to_binbuff(viewkey_string, viewkey_data) || viewkey_data.size() != sizeof(crypto::secret_key)) if(!viewkey_string.hex_to_pod(unwrap(unwrap(viewkey))))
{ {
fail_msg_writer() << tr("failed to parse secret view key"); fail_msg_writer() << tr("failed to parse secret view key");
return false; return false;
} }
crypto::secret_key viewkey = *reinterpret_cast<const crypto::secret_key*>(viewkey_data.data());
// check that the view key matches the given address // check that the view key matches the given address
crypto::public_key pkey; crypto::public_key pkey;
@ -3159,12 +3155,12 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
if(multisig_m == multisig_n) if(multisig_m == multisig_n)
{ {
std::vector<crypto::secret_key> multisig_secret_spendkeys(multisig_n); std::vector<crypto::secret_key> multisig_secret_spendkeys(multisig_n);
std::string spendkey_string; epee::wipeable_string spendkey_string;
cryptonote::blobdata spendkey_data; cryptonote::blobdata spendkey_data;
// get N secret spend keys from user // get N secret spend keys from user
for(unsigned int i=0; i<multisig_n; ++i) for(unsigned int i=0; i<multisig_n; ++i)
{ {
spendkey_string = input_line(tr((boost::format(tr("Secret spend key (%u of %u):")) % (i+1) % multisig_m).str().c_str())); spendkey_string = input_secure_line(tr((boost::format(tr("Secret spend key (%u of %u):")) % (i+1) % multisig_m).str().c_str()));
if (std::cin.eof()) if (std::cin.eof())
return false; return false;
if (spendkey_string.empty()) if (spendkey_string.empty())
@ -3172,12 +3168,11 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
fail_msg_writer() << tr("No data supplied, cancelled"); fail_msg_writer() << tr("No data supplied, cancelled");
return false; return false;
} }
if(!epee::string_tools::parse_hexstr_to_binbuff(spendkey_string, spendkey_data) || spendkey_data.size() != sizeof(crypto::secret_key)) if(!spendkey_string.hex_to_pod(unwrap(unwrap(multisig_secret_spendkeys[i]))))
{ {
fail_msg_writer() << tr("failed to parse spend key secret key"); fail_msg_writer() << tr("failed to parse spend key secret key");
return false; return false;
} }
multisig_secret_spendkeys[i] = *reinterpret_cast<const crypto::secret_key*>(spendkey_data.data());
} }
// sum the spend keys together to get the master spend key // sum the spend keys together to get the master spend key

41
src/wallet/wallet_rpc_server.cpp
View File

@ -773,10 +773,10 @@ namespace tools
{ {
if (get_tx_key) if (get_tx_key)
{ {
std::string s = epee::string_tools::pod_to_hex(ptx.tx_key); epee::wipeable_string s = epee::to_hex::wipeable_string(ptx.tx_key);
for (const crypto::secret_key& additional_tx_key : ptx.additional_tx_keys) for (const crypto::secret_key& additional_tx_key : ptx.additional_tx_keys)
s += epee::string_tools::pod_to_hex(additional_tx_key); s += epee::to_hex::wipeable_string(additional_tx_key);
fill(tx_key, s); fill(tx_key, std::string(s.data(), s.size()));
} }
// Compute amount leaving wallet in tx. By convention dests does not include change outputs // Compute amount leaving wallet in tx. By convention dests does not include change outputs
fill(amount, total_amount(ptx)); fill(amount, total_amount(ptx));
@ -1584,11 +1584,13 @@ namespace tools
} }
else if(req.key_type.compare("view_key") == 0) else if(req.key_type.compare("view_key") == 0)
{ {
res.key = string_tools::pod_to_hex(m_wallet->get_account().get_keys().m_view_secret_key); epee::wipeable_string key = epee::to_hex::wipeable_string(m_wallet->get_account().get_keys().m_view_secret_key);
res.key = std::string(key.data(), key.size());
} }
else if(req.key_type.compare("spend_key") == 0) else if(req.key_type.compare("spend_key") == 0)
{ {
res.key = string_tools::pod_to_hex(m_wallet->get_account().get_keys().m_spend_secret_key); epee::wipeable_string key = epee::to_hex::wipeable_string(m_wallet->get_account().get_keys().m_spend_secret_key);
res.key = std::string(key.data(), key.size());
} }
else else
{ {
@ -1814,11 +1816,11 @@ namespace tools
return false; return false;
} }
std::ostringstream oss; epee::wipeable_string s;
oss << epee::string_tools::pod_to_hex(tx_key); s += epee::to_hex::wipeable_string(tx_key);
for (size_t i = 0; i < additional_tx_keys.size(); ++i) for (size_t i = 0; i < additional_tx_keys.size(); ++i)
oss << epee::string_tools::pod_to_hex(additional_tx_keys[i]); s += epee::to_hex::wipeable_string(additional_tx_keys[i]);
res.tx_key = oss.str(); res.tx_key = std::string(s.data(), s.size());
return true; return true;
} }
//------------------------------------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------------------------------------
@ -1834,26 +1836,33 @@ namespace tools
return false; return false;
} }
std::string tx_key_str = req.tx_key; epee::wipeable_string tx_key_str = req.tx_key;
crypto::secret_key tx_key; if (tx_key_str.size() < 64 || tx_key_str.size() % 64)
if (!epee::string_tools::hex_to_pod(tx_key_str.substr(0, 64), tx_key))
{ {
er.code = WALLET_RPC_ERROR_CODE_WRONG_KEY; er.code = WALLET_RPC_ERROR_CODE_WRONG_KEY;
er.message = "Tx key has invalid format"; er.message = "Tx key has invalid format";
return false; return false;
} }
tx_key_str = tx_key_str.substr(64); const char *data = tx_key_str.data();
crypto::secret_key tx_key;
if (!epee::wipeable_string(data, 64).hex_to_pod(unwrap(unwrap(tx_key))))
{
er.code = WALLET_RPC_ERROR_CODE_WRONG_KEY;
er.message = "Tx key has invalid format";
return false;
}
size_t offset = 64;
std::vector<crypto::secret_key> additional_tx_keys; std::vector<crypto::secret_key> additional_tx_keys;
while (!tx_key_str.empty()) while (offset < tx_key_str.size())
{ {
additional_tx_keys.resize(additional_tx_keys.size() + 1); additional_tx_keys.resize(additional_tx_keys.size() + 1);
if (!epee::string_tools::hex_to_pod(tx_key_str.substr(0, 64), additional_tx_keys.back())) if (!epee::wipeable_string(data + offset, 64).hex_to_pod(unwrap(unwrap(additional_tx_keys.back()))))
{ {
er.code = WALLET_RPC_ERROR_CODE_WRONG_KEY; er.code = WALLET_RPC_ERROR_CODE_WRONG_KEY;
er.message = "Tx key has invalid format"; er.message = "Tx key has invalid format";
return false; return false;
} }
tx_key_str = tx_key_str.substr(64); offset += 64;
} }
cryptonote::address_parse_info info; cryptonote::address_parse_info info;