From 926721d54ebc69963b8036cfcdcb1a7e8d319503 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Fri, 29 Jan 2016 00:35:26 +0100
Subject: Windows Bootloader: Always hide password/PIM values with '*' after
 ENTER is hit, even if F5 was pressed to display password/PIM.

---
 src/Boot/Windows/BootMain.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/Boot/Windows/BootMain.cpp b/src/Boot/Windows/BootMain.cpp
index 7922c454..abab2038 100644
--- a/src/Boot/Windows/BootMain.cpp
+++ b/src/Boot/Windows/BootMain.cpp
@@ -169,16 +169,17 @@ static byte AskPassword (Password &password, int& pim)
 		{
 		case TC_BIOS_KEY_ENTER:
 			password.Length = pos;
-			if (hidePassword)
+			Print ("\r");
+			if (!PreventNormalSystemBoot)
+				Print ("Enter password: ");
+			pos = 0;
+			while (pos < MAX_PASSWORD)
 			{
-				while (pos < MAX_PASSWORD)
-				{
-					pos++;
-					if (pos < MAX_PASSWORD)
-						PrintChar ('*');
-					else
-						PrintCharAtCursor ('*');
-				}
+				pos++;
+				if (pos < MAX_PASSWORD)
+					PrintChar ('*');
+				else
+					PrintCharAtCursor ('*');
 			}
 
 			ClearBiosKeystrokeBuffer();
@@ -240,13 +241,12 @@ static byte AskPassword (Password &password, int& pim)
 		switch (scanCode)
 		{
 		case TC_BIOS_KEY_ENTER:
-			if (hidePassword)
+			Print ("\rPIM: ");
+			pos =0;
+			while (pos < MAX_PIM)
 			{
-				while (pos < MAX_PIM)
-				{
-					PrintChar ('*');
-					pos++;
-				}
+				PrintChar ('*');
+				pos++;
 			}
 
 			ClearBiosKeystrokeBuffer();
-- 
cgit v1.2.3