Mirrors
/
wownero
mirror of https://git.wownero.com/wownero/wownero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

simplewallet: prompt for private keys when generating wallets 

instead of supplying them on the command line. It's more
unwieldy, but better protects against information leaks.
This commit is contained in:
moneromooo-monero 2016-02-27 11:53:11 +00:00
parent 4513b4cd2b
commit c2a1fee428
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/simplewallet/simplewallet.cpp
View File

@ -81,8 +81,8 @@ namespace
{
const command_line::arg_descriptor<std::string> arg_wallet_file = {"wallet-file", sw::tr("Use wallet <arg>"), ""};
const command_line::arg_descriptor<std::string> arg_generate_new_wallet = {"generate-new-wallet", sw::tr("Generate new wallet and save it to <arg> or <address>.wallet by default"), ""};
const command_line::arg_descriptor<std::string> arg_generate_from_view_key = {"generate-from-view-key", sw::tr("Generate incoming-only wallet from (address:viewkey:filename) and save it to <filename>"), ""};
const command_line::arg_descriptor<std::string> arg_generate_from_keys = {"generate-from-keys", sw::tr("Generate wallet from (address:spendkey:viewkey:filename) and save it to <filename>"), ""};
const command_line::arg_descriptor<std::string> arg_generate_from_view_key = {"generate-from-view-key", sw::tr("Generate incoming-only wallet from view key"), ""};
const command_line::arg_descriptor<std::string> arg_generate_from_keys = {"generate-from-keys", sw::tr("Generate wallet from private keys"), ""};
const command_line::arg_descriptor<std::string> arg_daemon_address = {"daemon-address", sw::tr("Use daemon instance at <host>:<port>"), ""};
const command_line::arg_descriptor<std::string> arg_daemon_host = {"daemon-host", sw::tr("Use daemon instance at host <arg> instead of localhost"), ""};
const command_line::arg_descriptor<std::string> arg_password = {"password", sw::tr("Wallet password"), "", true};
@ -775,7 +775,7 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
if((!m_generate_new.empty()) + (!m_wallet_file.empty()) + (!m_generate_from_view_key.empty()) + (!m_generate_from_keys.empty()) > 1)
{
fail_msg_writer() << tr("can't specify more than one of --generate-new-wallet=\"wallet_name\", --wallet-file=\"wallet_name\", --generate-from-view-key and --generate-from-keys");
fail_msg_writer() << tr("can't specify more than one of --generate-new-wallet=\"wallet_name\", --wallet-file=\"wallet_name\", --generate-from-view-key=\"wallet_name\" and --generate-from-keys=\"wallet_name\"");
return false;
}
else if (m_generate_new.empty() && m_wallet_file.empty() && m_generate_from_view_key.empty() && m_generate_from_keys.empty())
@ -865,38 +865,36 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
}
if (!m_generate_from_view_key.empty())
{
// split address:viewkey:filename triple
std::vector<std::string> parts;
boost::split(parts,m_generate_from_view_key, boost::is_any_of(":"));
if (parts.size() < 3)
{
fail_msg_writer() << tr("--generate-from-view-key needs a address:viewkey:filename triple");
// parse address
std::string address_string = command_line::input_line("Standard address: ");
if (address_string.empty()) {
fail_msg_writer() << tr("No data supplied, cancelled");
return false;
}
// parse address
cryptonote::account_public_address address;
bool has_payment_id;
crypto::hash8 new_payment_id;
if(!get_account_integrated_address_from_str(address, has_payment_id, new_payment_id, testnet, parts[0]))
if(!get_account_integrated_address_from_str(address, has_payment_id, new_payment_id, testnet, address_string))
{
fail_msg_writer() << tr("failed to parse address");
return false;
}
// parse view secret key
std::string viewkey_string = command_line::input_line("View key: ");
if (viewkey_string.empty()) {
fail_msg_writer() << tr("No data supplied, cancelled");
return false;
}
cryptonote::blobdata viewkey_data;
if(!epee::string_tools::parse_hexstr_to_binbuff(parts[1], viewkey_data))
if(!epee::string_tools::parse_hexstr_to_binbuff(viewkey_string, viewkey_data))
{
fail_msg_writer() << tr("failed to parse view key secret key");
return false;
}
crypto::secret_key viewkey = *reinterpret_cast<const crypto::secret_key*>(viewkey_data.data());
// parse filename
m_wallet_file = parts[2];
for (size_t n = 3; n < parts.size(); ++n)
m_wallet_file += std::string(":") + parts[n];
m_wallet_file = m_generate_from_view_key;
// check the view key matches the given address
crypto::public_key pkey;
@ -914,28 +912,29 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
}
else if (!m_generate_from_keys.empty())
{
// split address:spendkey:viewkey:filename triple
std::vector<std::string> parts;
boost::split(parts,m_generate_from_keys, boost::is_any_of(":"));
if (parts.size() < 4)
{
fail_msg_writer() << tr("--generate-from-keys needs a address:spendkey:viewkey:filename quadruplet");
// parse address
std::string address_string = command_line::input_line("Standard address: ");
if (address_string.empty()) {
fail_msg_writer() << tr("No data supplied, cancelled");
return false;
}
// parse address
cryptonote::account_public_address address;
bool has_payment_id;
crypto::hash8 new_payment_id;
if(!get_account_integrated_address_from_str(address, has_payment_id, new_payment_id, testnet, parts[0]))
if(!get_account_integrated_address_from_str(address, has_payment_id, new_payment_id, testnet, address_string))
{
fail_msg_writer() << tr("failed to parse address");
return false;
}
// parse spend secret key
std::string spendkey_string = command_line::input_line("Spend key: ");
if (spendkey_string.empty()) {
fail_msg_writer() << tr("No data supplied, cancelled");
return false;
}
cryptonote::blobdata spendkey_data;
if(!epee::string_tools::parse_hexstr_to_binbuff(parts[1], spendkey_data))
if(!epee::string_tools::parse_hexstr_to_binbuff(spendkey_string, spendkey_data))
{
fail_msg_writer() << tr("failed to parse spend key secret key");
return false;
@ -943,18 +942,20 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
crypto::secret_key spendkey = *reinterpret_cast<const crypto::secret_key*>(spendkey_data.data());
// parse view secret key
std::string viewkey_string = command_line::input_line("View key: ");
if (viewkey_string.empty()) {
fail_msg_writer() << tr("No data supplied, cancelled");
return false;
}
cryptonote::blobdata viewkey_data;
if(!epee::string_tools::parse_hexstr_to_binbuff(parts[2], viewkey_data))
if(!epee::string_tools::parse_hexstr_to_binbuff(viewkey_string, viewkey_data))
{
fail_msg_writer() << tr("failed to parse view key secret key");
return false;
}
crypto::secret_key viewkey = *reinterpret_cast<const crypto::secret_key*>(viewkey_data.data());
// parse filename
m_wallet_file = parts[3];
for (size_t n = 4; n < parts.size(); ++n)
m_wallet_file += std::string(":") + parts[n];
m_wallet_file = m_generate_from_keys;
// check the spend and view keys match the given address
crypto::public_key pkey;