Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-27 17:29:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3298

Browse Source 
f2bb8085 Fix #3297 use the password_prompter helper (Howard Chu)
This commit is contained in:
Riccardo Spagni 2018-03-05 19:17:51 +02:00
commit a21c927d7d
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/simplewallet/simplewallet.cpp
View File

@ -606,10 +606,7 @@ bool simple_wallet::print_seed(bool encrypted)
epee::wipeable_string seed_pass; epee::wipeable_string seed_pass;
if (encrypted) if (encrypted)
{ {
#ifdef HAVE_READLINE auto pwd_container = password_prompter(tr("Enter optional seed encryption passphrase, empty to see raw seed"), true);
rdln::suspend_readline pause_readline;
#endif
auto pwd_container = tools::password_container::prompt(true, tr("Enter optional seed encryption passphrase, empty to see raw seed"));
if (std::cin.eof() || !pwd_container) if (std::cin.eof() || !pwd_container)
return true; return true;
seed_pass = pwd_container->password(); seed_pass = pwd_container->password();
@ -2244,10 +2241,7 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
} }
} }
#ifdef HAVE_READLINE auto pwd_container = password_prompter(tr("Enter seed encryption passphrase, empty if none"), false);
rdln::suspend_readline pause_readline;
#endif
auto pwd_container = tools::password_container::prompt(false, tr("Enter seed encryption passphrase, empty if none"));
if (std::cin.eof() || !pwd_container) if (std::cin.eof() || !pwd_container)
return false; return false;
epee::wipeable_string seed_pass = pwd_container->password(); epee::wipeable_string seed_pass = pwd_container->password();
@ -3141,7 +3135,7 @@ bool simple_wallet::save_watch_only(const std::vector<std::string> &args/* = std
return true; return true;
} }
const auto pwd_container = tools::password_container::prompt(true, tr("Password for new watch-only wallet")); const auto pwd_container = password_prompter(tr("Password for new watch-only wallet"), true);
if (!pwd_container) if (!pwd_container)
{ {