Merge pull request #4482

25e5890d wallet: fix --generate-from-json using wrong password (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-10-02 22:39:56 +02:00
commit 66094dee00
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
6 changed files with 20 additions and 7 deletions

View file

@ -221,6 +221,10 @@ namespace tools
: m_password(std::move(password))
{
}
password_container::password_container(const epee::wipeable_string& password) noexcept
: m_password(password)
{
}
password_container::~password_container() noexcept
{

View file

@ -47,6 +47,7 @@ namespace tools
//! `password` is used as password
password_container(std::string&& password) noexcept;
password_container(const epee::wipeable_string& password) noexcept;
//! \return A password from stdin TTY prompt or `std::cin` pipe.
static boost::optional<password_container> prompt(bool verify, const char *mesage = "Password", bool hide_input = true);