diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-10-02 22:39:56 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-10-02 22:39:57 +0200 |
| commit | 66094dee00845dd8a7eefb0e73ed65d4b7a76d2e (patch) | |
| tree | d7db90eb69beb278b7de01e920364581ee65ba6b /src/common | |
| parent | be6063ea59a713c4ddfdd27e8d8d240fec63a3f1 (diff) | |
| parent | 25e5890d37a1b243d4b8aadb45743d715bd4d0f9 (diff) | |
| download | monzero-core-66094dee00845dd8a7eefb0e73ed65d4b7a76d2e.tar.gz monzero-core-66094dee00845dd8a7eefb0e73ed65d4b7a76d2e.tar.xz monzero-core-66094dee00845dd8a7eefb0e73ed65d4b7a76d2e.zip | |
Merge pull request #4482
25e5890d wallet: fix --generate-from-json using wrong password (moneromooo-monero)
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/password.cpp | 4 | ||||
| -rw-r--r-- | src/common/password.h | 1 |
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); |