aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-10-10 12:15:20 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-10-14 10:38:11 +0000
commit067e232b19acbcee6f1d82d03f8f889e3bf86eb5 (patch)
tree830ba260c410ca64c98e4a6a63c73b2d245a7c87
parentMerge pull request #4544 (diff)
downloadmonero-067e232b19acbcee6f1d82d03f8f889e3bf86eb5.tar.xz
password: fix secure input with echo on windows
Thanks to iDunk for the testing back and forth
-rw-r--r--src/common/password.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/common/password.cpp b/src/common/password.cpp
index a8d5141dc..7ba3fcb42 100644
--- a/src/common/password.cpp
+++ b/src/common/password.cpp
@@ -60,7 +60,7 @@ namespace
DWORD mode_old;
::GetConsoleMode(h_cin, &mode_old);
- DWORD mode_new = mode_old & ~((hide_input ? ENABLE_ECHO_INPUT : 0) | ENABLE_LINE_INPUT);
+ DWORD mode_new = mode_old & ~(hide_input ? ENABLE_ECHO_INPUT : 0);
::SetConsoleMode(h_cin, mode_new);
bool r = true;
@@ -78,7 +78,11 @@ namespace
{
break;
}
- else if (ucs2_ch == L'\n' || ucs2_ch == L'\r')
+ else if (ucs2_ch == L'\r')
+ {
+ continue;
+ }
+ else if (ucs2_ch == L'\n')
{
std::cout << std::endl;
break;