diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 60 | ||||
| -rw-r--r-- | src/simplewallet/simplewallet.h | 12 | ||||
| -rw-r--r-- | src/version.h.in | 2 | ||||
| -rw-r--r-- | src/wallet/wallet2.cpp | 66 | ||||
| -rw-r--r-- | src/wallet/wallet2.h | 5 | ||||
| -rw-r--r-- | utils/gpg_keys/warptangent.asc | 52 |
7 files changed, 188 insertions, 11 deletions
@@ -32,7 +32,7 @@ all-release: release-static: mkdir -p build/release - cd build/release && cmake -D STATIC=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) + cd build/release && cmake -D STATIC=ON -D ARCH="x86-64" -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) clean: @echo "WARNING: Back-up your wallet if it exists within ./build!" ; \ diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 61c74449c..d82b1a17d 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -231,6 +231,36 @@ bool simple_wallet::seed(const std::vector<std::string> &args/* = std::vector<st return true; } +bool simple_wallet::seed_set_language(const std::vector<std::string> &args/* = std::vector<std::string>()*/) +{ + bool success = false; + if (!m_wallet->is_deterministic()) + { + fail_msg_writer() << "This wallet is non-deterministic and doesn't have a seed."; + return true; + } + tools::password_container pwd_container; + success = pwd_container.read_password(); + if (!success) + { + fail_msg_writer() << "failed to read wallet password"; + return true; + } + + /* verify password before using so user doesn't accidentally set a new password for rewritten wallet */ + success = m_wallet->verify_password(pwd_container.password()); + if (!success) + { + fail_msg_writer() << "invalid password"; + return true; + } + + std::string mnemonic_language = get_mnemonic_language(); + m_wallet->set_seed_language(mnemonic_language); + m_wallet->rewrite(m_wallet_file, pwd_container.password()); + return true; +} + bool simple_wallet::help(const std::vector<std::string> &args/* = std::vector<std::string>()*/) { success_msg_writer() << get_commands_str(); @@ -255,9 +285,39 @@ simple_wallet::simple_wallet() m_cmd_binder.set_handler("save", boost::bind(&simple_wallet::save, this, _1), "Save wallet synchronized data"); m_cmd_binder.set_handler("viewkey", boost::bind(&simple_wallet::viewkey, this, _1), "Get viewkey"); m_cmd_binder.set_handler("seed", boost::bind(&simple_wallet::seed, this, _1), "Get deterministic seed"); + m_cmd_binder.set_handler("set", boost::bind(&simple_wallet::set_variable, this, _1), "available options: seed language - Set wallet seed langage"); m_cmd_binder.set_handler("help", boost::bind(&simple_wallet::help, this, _1), "Show this help"); } //---------------------------------------------------------------------------------------------------- +bool simple_wallet::set_variable(const std::vector<std::string> &args) +{ + if (args.empty()) + { + fail_msg_writer() << "set: needs an argument. available options: seed"; + return true; + } + else + { + if (args[0] == "seed") + { + if (args.size() == 1) + { + fail_msg_writer() << "set seed: needs an argument. available options: language"; + return true; + } + else if (args[1] == "language") + { + std::vector<std::string> local_args = args; + local_args.erase(local_args.begin(), local_args.begin()+2); + seed_set_language(local_args); + return true; + } + } + } + fail_msg_writer() << "set: unrecognized argument(s)"; + return true; +} +//---------------------------------------------------------------------------------------------------- bool simple_wallet::set_log(const std::vector<std::string> &args) { if(args.size() != 1) diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h index ebc85ed17..278df707b 100644 --- a/src/simplewallet/simplewallet.h +++ b/src/simplewallet/simplewallet.h @@ -81,6 +81,17 @@ namespace cryptonote bool viewkey(const std::vector<std::string> &args = std::vector<std::string>()); bool seed(const std::vector<std::string> &args = std::vector<std::string>()); + + /*! + * \brief Sets seed language. + * + * interactive + * - prompts for password so wallet can be rewritten + * - calls get_mnemonic_language() which prompts for language + * + * \return success status + */ + bool seed_set_language(const std::vector<std::string> &args = std::vector<std::string>()); bool help(const std::vector<std::string> &args = std::vector<std::string>()); bool start_mining(const std::vector<std::string> &args); bool stop_mining(const std::vector<std::string> &args); @@ -96,6 +107,7 @@ namespace cryptonote ); bool print_address(const std::vector<std::string> &args = std::vector<std::string>()); bool save(const std::vector<std::string> &args); + bool set_variable(const std::vector<std::string> &args); bool set_log(const std::vector<std::string> &args); uint64_t get_daemon_blockchain_height(std::string& err); diff --git a/src/version.h.in b/src/version.h.in index a09131cdb..6dd62faf9 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -1,3 +1,3 @@ #define MONERO_VERSION_TAG "@VERSIONTAG@" -#define MONERO_VERSION "0.8.8.6" +#define MONERO_VERSION "0.8.8.7" #define MONERO_VERSION_FULL MONERO_VERSION "-" MONERO_VERSION_TAG diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 2b84cbbf3..1c5ec027c 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -571,6 +571,54 @@ void wallet2::load_keys(const std::string& keys_file_name, const std::string& pa } /*! + * \brief verify password for default wallet keys file. + * \param password Password to verify + * + * for verification only + * should not mutate state, unlike load_keys() + * can be used prior to rewriting wallet keys file, to ensure user has entered the correct password + * + */ +bool wallet2::verify_password(const std::string& password) +{ + const std::string keys_file_name = m_keys_file; + wallet2::keys_file_data keys_file_data; + std::string buf; + bool r = epee::file_io_utils::load_file_to_string(keys_file_name, buf); + THROW_WALLET_EXCEPTION_IF(!r, error::file_read_error, keys_file_name); + + // Decrypt the contents + r = ::serialization::parse_binary(buf, keys_file_data); + THROW_WALLET_EXCEPTION_IF(!r, error::wallet_internal_error, "internal error: failed to deserialize \"" + keys_file_name + '\"'); + crypto::chacha8_key key; + crypto::generate_chacha8_key(password, key); + std::string account_data; + account_data.resize(keys_file_data.account_data.size()); + crypto::chacha8(keys_file_data.account_data.data(), keys_file_data.account_data.size(), key, keys_file_data.iv, &account_data[0]); + + // The contents should be JSON if the wallet follows the new format. + rapidjson::Document json; + if (json.Parse(account_data.c_str(), keys_file_data.account_data.size()).HasParseError()) + { + // old format before JSON wallet key file format + } + else + { + account_data = std::string(json["key_data"].GetString(), json["key_data"].GetString() + + json["key_data"].GetStringLength()); + } + + cryptonote::account_base account_data_check; + + r = epee::serialization::load_t_from_binary(account_data_check, account_data); + const cryptonote::account_keys& keys = account_data_check.get_keys(); + + r = r && verify_keys(keys.m_view_secret_key, keys.m_account_address.m_view_public_key); + r = r && verify_keys(keys.m_spend_secret_key, keys.m_account_address.m_spend_public_key); + return r; +} + +/*! * \brief Generates a wallet or restores one. * \param wallet_ Name of wallet file * \param password Password of wallet file @@ -616,11 +664,9 @@ void wallet2::rewrite(const std::string& wallet_name, const std::string& passwor { prepare_file_names(wallet_name); boost::system::error_code ignored_ec; - THROW_WALLET_EXCEPTION_IF(!boost::filesystem::exists(m_wallet_file, ignored_ec), error::file_not_found, m_wallet_file); THROW_WALLET_EXCEPTION_IF(!boost::filesystem::exists(m_keys_file, ignored_ec), error::file_not_found, m_keys_file); bool r = store_keys(m_keys_file, password); THROW_WALLET_EXCEPTION_IF(!r, error::file_save_error, m_keys_file); - store(); } //---------------------------------------------------------------------------------------------------- void wallet2::wallet_exists(const std::string& file_path, bool& keys_file_exists, bool& wallet_file_exists) @@ -691,14 +737,16 @@ void wallet2::load(const std::string& wallet_, const std::string& password) { LOG_PRINT_L0("file not found: " << m_wallet_file << ", starting with empty blockchain"); m_account_public_address = m_account.get_keys().m_account_address; - return; } - bool r = tools::unserialize_obj_from_file(*this, m_wallet_file); - THROW_WALLET_EXCEPTION_IF(!r, error::file_read_error, m_wallet_file); - THROW_WALLET_EXCEPTION_IF( - m_account_public_address.m_spend_public_key != m_account.get_keys().m_account_address.m_spend_public_key || - m_account_public_address.m_view_public_key != m_account.get_keys().m_account_address.m_view_public_key, - error::wallet_files_doesnt_correspond, m_keys_file, m_wallet_file); + else + { + bool r = tools::unserialize_obj_from_file(*this, m_wallet_file); + THROW_WALLET_EXCEPTION_IF(!r, error::file_read_error, m_wallet_file); + THROW_WALLET_EXCEPTION_IF( + m_account_public_address.m_spend_public_key != m_account.get_keys().m_account_address.m_spend_public_key || + m_account_public_address.m_view_public_key != m_account.get_keys().m_account_address.m_view_public_key, + error::wallet_files_doesnt_correspond, m_keys_file, m_wallet_file); + } cryptonote::block genesis; generate_genesis(genesis); diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index e037bf42d..d9b1217c7 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -153,6 +153,11 @@ namespace tools void rewrite(const std::string& wallet_name, const std::string& password); void load(const std::string& wallet, const std::string& password); void store(); + + /*! + * \brief verifies given password is correct for default wallet keys file + */ + bool verify_password(const std::string& password); cryptonote::account_base& get_account(){return m_account;} // upper_transaction_size_limit as defined below is set to diff --git a/utils/gpg_keys/warptangent.asc b/utils/gpg_keys/warptangent.asc new file mode 100644 index 000000000..cacd787b6 --- /dev/null +++ b/utils/gpg_keys/warptangent.asc @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQINBFSFIj0BEADMJ+82coHXja8ZCQNhs0uw8xTP0Nu3AFIKrCOZIxNFpJvLugOd +B6IKg3q4YNa5RjhOwVRNfzGk4HsYlo+Wg+pw0pGI1WEYJMQ+gvNACKxDGfgxtDL6 +SgugYxUQqPxud5V6GagyV56e47hfdK0WLmYGsIORoX8nksIAvHbL+T9OVpcdP87s +5NLyJBFZrrLR404wunnlr2WTE/3Nmm663sGKI+hb7Xb9G09pr0ba8+f4uYtEycaS +xEBQbeO9Fs/kt02d2oIeqrxulXBHq9LjhXIjiXpeEXUGd6mJmwenclOnreI04esp +TivsiXRcGFnMFAwqTqlrentmzA0ucYuqcSuiId8cEBi2s6KeIAz9we2z8BDeZ1t8 +mT4Xj+GQN9Ki9UiC6a5/6rsXVDXZlURfC9bs0m64IPsEsx/tdr57rKtPD72psgF2 +FQaZpKuBnHu7NQAxydRYd3+5mhqMl0H2OI3Gt7JxdpDFGXjx02gw5rDylwBeiuUc +YkWnkapBEHW8dlvEgYaEOv7lEMg8UR/B0r2EuVDQAQQeFIJ2HitU1xe102RmR74J +OQ2jwLlLip7rA/95v4neVw0z5diVktQ3WtqhwZhQCcednrDhkYnIcsGyBLDi4Pgw +n2H7ppfpzUt/V21bW0nZTkoHC3H1fHN5ar4Jui1dUECbYU5J2RUTxSvE/wARAQAB +tCN3YXJwdGFuZ2VudCA8d2FycHRhbmdlbnRAaW5ib3guY29tPokCOAQTAQIAIgUC +VIUiPQIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQDkkL6/vk6S1c4A/8 +DUIcwgIiUQJIHVfo7TA362lF2nvBOXhE7kiSdk2CeaWEjm7aAaZjwF9oorrMgvkc +hvgg7EzqtNTGt+mqRHszhM4tu8KGrsayxR3i0hDvjcMSUa/45V10ftqGih0f59RD +vGteM7B+qbttHJnRZJNVKgXwUZSLpD7g29W8GcdL3MXmoSQaOmMbWf5CB60hmDYt +Rd8kuHWN9W5Fm+QbYU5WMP1XCt+QmIE8QxFL5m7qRFE9vN/9Elr0VNJo0vMKiz+F +6Kc2985cNE4eTqEwCJm2UBoM86RqGOL6ifMqv6/c2Mb1uZUVVk28wmGb5ZAdLY5p +RKcNjg9O/urwfzaRVdUXZ8wBAGsUPMDyli8dHx4MmCoCqqwGPT/qs9FE+AlKFtiQ +vQ90aeVTw38J6SwOPRw92o/8uIh5EilpaOa5fSKODd0IORxvXyXWF93IaXs13eER +7v9gmvuiMO64lZ7kFqpE0e5FShiJm7PoqhL0mjZik5ThvAC+ZYCiU8CKTOI8iozM +u20yTsCRsSc98Mf6wEZfc6Eht+i9QXxwgkKOHSzPkBLNcxE2z6XgOAMOLCL9NveC +R73fSMQb+hOU7pOfaM7dHYVnrmIOcpS3HrlQJIspdavZdHBrxfQI6GLX652zW4QK +RPDDVnfLwhUDqbjJgw6bncuBhqXqIvcmRgonqRpcj1G5Ag0EVIUiPQEQAKo8YJZ0 +cFW7p8vnsU3cntccyhsh9F9BcREZJbvhUJJMQj1Q4hACzf7u/m9rims2Ez1KRWHb +8gSfA4VUYZGpLgCMxFB8gPV/fC5hiOFQNuVdO9wPtW3LfJ9PMlulyIzod+CeQeqf +Ve0Vwo01NZQtpIU8Y8ROiljhZq3kWS5Rtd96uBcFXKdcWdsH6IIYF1t3xfJLBjKA +jzsAr+5R8oYmIP/uIguQKvIc4OwC7jVdhi0vfBClJNBuRZcWIqfwKXAh8zqMUNFK +ZELbfnNo1zoIXhpsa2ZsSxUHB60oJFrCPvxASjCkSoIvq0lELA+wlSAlJS1I24ZZ +CON4OiReuY8RguY/E+I+WaARgPNui9LN14vgzqeIWTy5f23URjmVIzjWLzVmJI/U +uoIVrcdUDuiEFaCDxVHPropA7d1KanwLnTTgnEPBwegz5LMPtMO0RfleJnFHEYM2 +ZPfsIxWAsz4cgSeRIp5Dl6NMdtIU3HYWtFN+LAIv3sksroNiBCKqhB+L/o5J5+0t +evzAQvm/TrejM4zoBina19uuc5TqMCl3evQryLgx8KQ5gglNftfrNgS3U6//VdTa +rmm6aWNZM81EJr2KzlfNuSANCAdA72ppQjlsBphm+zWFi7SNrooCKmSt7nRpNhxM +xQLnfEvaFyOHAEOiD1aLSL4QEoy/hGRW3xidABEBAAGJAh8EGAECAAkFAlSFIj0C +GwwACgkQDkkL6/vk6S3NOQ//QUJAyEnJRWM7NgWGH1re7l3GQ/tz3ZdJBdEcZqYN +2dHXMBV32umD6bGluEW3COOJ7WCvcdkENDAAaf4Ygt4qnAUDXOH5xKXrBM0NHA+e +AHL31V7Pa9NmcTbw5OPCVLZop8Gkh4sYKE/tZKrP7yUvVu3t5JayOjQny3riIoZP +vBvjzRu5roqKa1/rYUBB9lu0Qi9L84Q1T48Hn04ke39Rweoa/rd35k4I8c7Q4382 +d9426GncSjfgdHF9fR2hoQSvof5BQa0toRIwW2RkUbAtyJ9fWg01XLLActpRON1S +BthtuuV6Qfx4SQs5g0cHMlgcnu1qNKEkBwYWxzPvYJAjAeAmHZfyePyOgOccwAab +ovE8A6ktbw+LeTC4NwYPSILyQYxxxJN+0pBnMfxUE//9luztVk70X6DCbn0t5nsN +H7JBn6XJkWSsObbYZC2Nvfevk9iJh96Ln6nWHkCviwnUVHjetHuBsTGFAIcM6idT +ixqmu+1GohRvrs0OlVeBlR/Lf93YI+YaeBhQAuBOdi8YgpkDhOSEa4jos2zy3N+U +1e7PLIITICZmxCj703TMT6EkYuJa0iZkZE32CF+svF+4IxPGOxfhZSVF572EMPcH +ggZGV0vR7gu7cJRqLqKG3M8UM60tuYFpjT3+6344Akum+YPH8wjo7hbyun5MZdTB +vL0= +=lURU +-----END PGP PUBLIC KEY BLOCK----- |