Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4587 

067e232b password: fix secure input with echo on windows (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-10-15 13:47:53 +02:00
parent 3c36a6a227 067e232b19
commit a9504f7001
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/password.cpp
View File

@ -60,7 +60,7 @@ namespace
DWORD mode_old; DWORD mode_old;
::GetConsoleMode(h_cin, &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); ::SetConsoleMode(h_cin, mode_new);
bool r = true; bool r = true;
@ -78,7 +78,11 @@ namespace
{ {
break; 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; std::cout << std::endl;
break; break;