--- truecrypt/boot/windows/bootdefs.h	2018/04/24 16:52:06	1.1.1.3
+++ truecrypt/boot/windows/bootdefs.h	2018/04/24 16:55:26	1.1.1.4
@@ -1,7 +1,7 @@
 /*
  Copyright (c) 2008 TrueCrypt Foundation. All rights reserved.
 
- Governed by the TrueCrypt License 2.4 the full text of which is contained
+ Governed by the TrueCrypt License 2.5 the full text of which is contained
  in the file License.txt included in TrueCrypt binary and source code
  distribution packages.
 */
@@ -16,7 +16,11 @@
 #	undef TC__BOOT_MEMORY_REQUIRED
 
 #	ifdef TC_WINDOWS_BOOT_AES
-#		define TC__BOOT_MEMORY_REQUIRED		27
+#		ifdef TC_WINDOWS_BOOT_RESCUE_DISK_MODE
+#			define TC__BOOT_MEMORY_REQUIRED	28
+#		else
+#			define TC__BOOT_MEMORY_REQUIRED	27
+#		endif
 #	elif defined (TC_WINDOWS_BOOT_SERPENT)
 #		define TC__BOOT_MEMORY_REQUIRED		32
 #	elif defined (TC_WINDOWS_BOOT_TWOFISH)
@@ -42,7 +46,7 @@
 
 #define TC__BOOT_SECTOR_LOADER_LENGTH_OFFSET 432
 #define TC__BOOT_SECTOR_LOADER_CHECKSUM_OFFSET 434
-#define TC__BOOT_SECTOR_CONFIG_OFFSET 439 // Last byte reserved for boot loader
+#define TC__BOOT_SECTOR_CONFIG_OFFSET 439	// The last byte that is reserved for the boot loader
 
 #define TC__BOOT_LOADER_DECOMPRESSOR_START_SECTOR 2
 #define TC__BOOT_LOADER_DECOMPRESSOR_SECTOR_COUNT 4
@@ -57,11 +61,21 @@
 
 #define TC__GZIP_HEADER_SIZE 10
 
+#define TC__BOOT_CFG_FLAG_AREA_SIZE	1	// In bytes
+
+// If you add more flags, revise TC__BOOT_CFG_FLAG_AREA_SIZE
 #define TC__BOOT_CFG_FLAG_BACKUP_LOADER_AVAILABLE		TC_HEX (02)
 #define TC__BOOT_CFG_FLAG_WINDOWS_VISTA_OR_LATER		TC_HEX (04)
-#define TC__BOOT_CFG_FLAG_RESCUE_DISK					TC_HEX (10)
 #define TC__BOOT_CFG_FLAG_RESCUE_DISK_ORIG_SYS_LOADER	TC_HEX (20)
 
+#define TC__BOOT_CFG_MASK_HIDDEN_OS_CREATION_PHASE		(TC_HEX (40) + TC_HEX (80))
+
+// The following items are treated as a 2-bit value (apply TC_BOOT_CFG_MASK_HIDDEN_OS_CREATION_PHASE to obtain the value)
+#define TC__HIDDEN_OS_CREATION_PHASE_NONE		0
+#define TC__HIDDEN_OS_CREATION_PHASE_CLONING	TC_HEX (40)		// The boot loader is to copy the content of the system partition to the hidden volume
+#define TC__HIDDEN_OS_CREATION_PHASE_DECOY_OS	TC_HEX (80)		// The boot loader has successfully copied the content of the system partition to the hidden volume (the decoy OS is to be encrypted now)
+#define TC__HIDDEN_OS_CREATION_PHASE_RESERVED	(TC_HEX (40) + TC_HEX (80))		// Reserved for possible future use
+
 
 #ifdef TC_ASM_PREPROCESS
 
@@ -88,12 +102,16 @@ TC_MAX_BOOT_LOADER_SECTOR_COUNT = TC__MA
 TC_MAX_BOOT_LOADER_DECOMPRESSED_SIZE = TC__MAX_BOOT_LOADER_DECOMPRESSED_SIZE
 TC_BOOT_LOADER_BACKUP_SECTOR_COUNT = TC__BOOT_LOADER_BACKUP_SECTOR_COUNT
 TC_GZIP_HEADER_SIZE = TC__GZIP_HEADER_SIZE
+TC_BOOT_CFG_FLAG_AREA_SIZE = TC__BOOT_CFG_FLAG_AREA_SIZE
 TC_BOOT_CFG_FLAG_BACKUP_LOADER_AVAILABLE = TC__BOOT_CFG_FLAG_BACKUP_LOADER_AVAILABLE
 TC_BOOT_CFG_FLAG_WINDOWS_VISTA_OR_LATER = TC__BOOT_CFG_FLAG_WINDOWS_VISTA_OR_LATER
-TC_BOOT_CFG_FLAG_RESCUE_DISK = TC__BOOT_CFG_FLAG_RESCUE_DISK
 TC_BOOT_CFG_FLAG_RESCUE_DISK_ORIG_SYS_LOADER = TC__BOOT_CFG_FLAG_RESCUE_DISK_ORIG_SYS_LOADER
+TC_BOOT_CFG_MASK_HIDDEN_OS_CREATION_PHASE = TC__BOOT_CFG_MASK_HIDDEN_OS_CREATION_PHASE
+TC_HIDDEN_OS_CREATION_PHASE_NONE = TC__HIDDEN_OS_CREATION_PHASE_NONE
+TC_HIDDEN_OS_CREATION_PHASE_CLONING = TC__HIDDEN_OS_CREATION_PHASE_CLONING
+TC_HIDDEN_OS_CREATION_PHASE_DECOY_OS = TC__HIDDEN_OS_CREATION_PHASE_DECOY_OS
 
-#else
+#else // TC_ASM_PREPROCESS
 
 #define TC_HEX(N) 0x##N
 #define TC_UNSIGNED(N) N##U
@@ -116,11 +134,15 @@ TC_BOOT_CFG_FLAG_RESCUE_DISK_ORIG_SYS_LO
 #define TC_MAX_BOOT_LOADER_DECOMPRESSED_SIZE TC__MAX_BOOT_LOADER_DECOMPRESSED_SIZE
 #define TC_BOOT_LOADER_BACKUP_SECTOR_COUNT TC__BOOT_LOADER_BACKUP_SECTOR_COUNT
 #define TC_GZIP_HEADER_SIZE TC__GZIP_HEADER_SIZE
+#define TC_BOOT_CFG_FLAG_AREA_SIZE TC__BOOT_CFG_FLAG_AREA_SIZE
 #define TC_BOOT_CFG_FLAG_BACKUP_LOADER_AVAILABLE TC__BOOT_CFG_FLAG_BACKUP_LOADER_AVAILABLE
 #define TC_BOOT_CFG_FLAG_WINDOWS_VISTA_OR_LATER TC__BOOT_CFG_FLAG_WINDOWS_VISTA_OR_LATER
-#define TC_BOOT_CFG_FLAG_RESCUE_DISK TC__BOOT_CFG_FLAG_RESCUE_DISK
 #define TC_BOOT_CFG_FLAG_RESCUE_DISK_ORIG_SYS_LOADER TC__BOOT_CFG_FLAG_RESCUE_DISK_ORIG_SYS_LOADER
+#define TC_BOOT_CFG_MASK_HIDDEN_OS_CREATION_PHASE TC__BOOT_CFG_MASK_HIDDEN_OS_CREATION_PHASE
+#define TC_HIDDEN_OS_CREATION_PHASE_NONE TC__HIDDEN_OS_CREATION_PHASE_NONE
+#define TC_HIDDEN_OS_CREATION_PHASE_CLONING TC__HIDDEN_OS_CREATION_PHASE_CLONING
+#define TC_HIDDEN_OS_CREATION_PHASE_DECOY_OS TC__HIDDEN_OS_CREATION_PHASE_DECOY_OS
 
-#endif
+#endif // TC_ASM_PREPROCESS
 
 #endif // TC_HEADER_Boot_BootDefs