aboutsummaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-10-01 11:18:50 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-10-01 12:32:26 +0000
commit25e5890d37a1b243d4b8aadb45743d715bd4d0f9 (patch)
tree2cb9f5543d11a7f7e18145cb0dcf15f209c38c73 /src/common
parentMerge pull request #4333 (diff)
downloadmonero-25e5890d37a1b243d4b8aadb45743d715bd4d0f9.tar.xz
wallet: fix --generate-from-json using wrong password
Diffstat (limited to 'src/common')
-rw-r--r--src/common/password.cpp4
-rw-r--r--src/common/password.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/src/common/password.cpp b/src/common/password.cpp
index 5671c4a4e..b32bedae2 100644
--- a/src/common/password.cpp
+++ b/src/common/password.cpp
@@ -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
{
diff --git a/src/common/password.h b/src/common/password.h
index 529881e40..beb98283b 100644
--- a/src/common/password.h
+++ b/src/common/password.h
@@ -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);