From 1396269d573256248bece97e1e291ef0c08e513f Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Wed, 20 Apr 2016 00:30:28 +0200
Subject: Windows: Add option to avoid PIM prompt in pre-boot authentication by
 storing PIM value unencrypted in MBR.

---
 src/Boot/Windows/BootMain.cpp | 120 +++++++++++++++++++++++-------------------
 1 file changed, 66 insertions(+), 54 deletions(-)

(limited to 'src/Boot/Windows/BootMain.cpp')

diff --git a/src/Boot/Windows/BootMain.cpp b/src/Boot/Windows/BootMain.cpp
index abab2038..275c5762 100644
--- a/src/Boot/Windows/BootMain.cpp
+++ b/src/Boot/Windows/BootMain.cpp
@@ -231,71 +231,83 @@ static byte AskPassword (Password &password, int& pim)
 			PrintCharAtCursor (asciiCode);
 	}
 
-	pos = 0;
-	Print ("PIM: ");
-
-	while (true)
+#ifndef TC_WINDOWS_BOOT_RESCUE_DISK_MODE
+	if (PimValueOrHiddenVolumeStartUnitNo.LowPart != -1)
 	{
-		asciiCode = GetKeyboardChar (&scanCode);
+		pim = (int) PimValueOrHiddenVolumeStartUnitNo.LowPart;
+		// reset stored PIM value to allow requesting PIM next time in case the stored value is wrong
+		PimValueOrHiddenVolumeStartUnitNo.LowPart = -1;
+		return TC_BIOS_KEY_ENTER;
+	}
+	else
+#endif
+	{
+		pos = 0;
+		Print ("PIM: ");
 
-		switch (scanCode)
+		while (true)
 		{
-		case TC_BIOS_KEY_ENTER:
-			Print ("\rPIM: ");
-			pos =0;
-			while (pos < MAX_PIM)
+			asciiCode = GetKeyboardChar (&scanCode);
+
+			switch (scanCode)
 			{
-				PrintChar ('*');
-				pos++;
-			}
+			case TC_BIOS_KEY_ENTER:
+				Print ("\rPIM: ");
+				pos =0;
+				while (pos < MAX_PIM)
+				{
+					PrintChar ('*');
+					pos++;
+				}
 
-			ClearBiosKeystrokeBuffer();
-			PrintEndl();
-			
-			return TC_BIOS_KEY_ENTER;
+				ClearBiosKeystrokeBuffer();
+				PrintEndl();
+				
+				return TC_BIOS_KEY_ENTER;
 
-		case TC_BIOS_KEY_BACKSPACE:
-			if (pos > 0)
-			{
-				if (pos < MAX_PIM)
-					PrintBackspace();
-				else
-					PrintCharAtCursor (' ');
+			case TC_BIOS_KEY_BACKSPACE:
+				if (pos > 0)
+				{
+					if (pos < MAX_PIM)
+						PrintBackspace();
+					else
+						PrintCharAtCursor (' ');
 
-				--pos;
-				pim /= 10;
-			}
-			continue;
+					--pos;
+					pim /= 10;
+				}
+				continue;
 
-		case TC_BIOS_KEY_F5:
-			hidePassword ^= 0x01;
-			continue;
+			case TC_BIOS_KEY_F5:
+				hidePassword ^= 0x01;
+				continue;
 
-		default:
-			if (scanCode == TC_BIOS_KEY_ESC || IsMenuKey (scanCode))
-			{
-				burn (password.Text, sizeof (password.Text));
-				ClearBiosKeystrokeBuffer();
+			default:
+				if (scanCode == TC_BIOS_KEY_ESC || IsMenuKey (scanCode))
+				{
+					burn (password.Text, sizeof (password.Text));
+					ClearBiosKeystrokeBuffer();
 
-				PrintEndl();
-				return scanCode;
+					PrintEndl();
+					return scanCode;
+				}
 			}
-		}
 
-		if (!IsDigit (asciiCode) || pos == MAX_PIM)
-		{
-			Beep();
-			continue;
-		}
+			if (!IsDigit (asciiCode) || pos == MAX_PIM)
+			{
+				Beep();
+				continue;
+			}
 
-		pim = 10*pim + (asciiCode - '0');
-		pos++;
-		
-		if (hidePassword) asciiCode = '*';
-		if (pos < MAX_PIM)
-			PrintChar (asciiCode);
-		else
-			PrintCharAtCursor (asciiCode);
+			pim = 10*pim + (asciiCode - '0');
+			pos++;
+			
+			if (hidePassword) asciiCode = '*';
+			if (pos < MAX_PIM)
+				PrintChar (asciiCode);
+			else
+				PrintCharAtCursor (asciiCode);
+		}
 	}
 }
 
@@ -468,7 +480,7 @@ static bool MountVolume (byte drive, byte &exitKey, bool skipNormal, bool skipHi
 
 		EncryptedVirtualPartition.StartSector = BootCryptoInfo->EncryptedAreaStart >> TC_LB_SIZE_BIT_SHIFT_DIVISOR;
 		
-		HiddenVolumeStartUnitNo = EncryptedVirtualPartition.StartSector;
+		PimValueOrHiddenVolumeStartUnitNo = EncryptedVirtualPartition.StartSector;
 		HiddenVolumeStartSector = PartitionFollowingActive.StartSector;
 		HiddenVolumeStartSector += EncryptedVirtualPartition.StartSector;
 
@@ -749,7 +761,7 @@ static bool CopySystemPartitionToHiddenVolume (byte drive, byte &exitKey)
 		{
 			CopyMemory (TC_BOOT_LOADER_BUFFER_SEGMENT, i * TC_LB_SIZE, SectorBuffer, TC_LB_SIZE);
 
-			uint64 s = HiddenVolumeStartUnitNo + sectorOffset + i;
+			uint64 s = PimValueOrHiddenVolumeStartUnitNo + sectorOffset + i;
 			EncryptDataUnits (SectorBuffer, &s, 1, BootCryptoInfo);
 
 			CopyMemory (SectorBuffer, TC_BOOT_LOADER_BUFFER_SEGMENT, i * TC_LB_SIZE, TC_LB_SIZE);
-- 
cgit v1.2.3