--- truecrypt/boot/windows/bootcommon.h	2018/04/24 16:49:04	1.1.1.1
+++ truecrypt/boot/windows/bootcommon.h	2018/04/24 17:05:37	1.1.1.6
@@ -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.8 the full text of which is contained
  in the file License.txt included in TrueCrypt binary and source code
  distribution packages.
 */
@@ -9,9 +9,11 @@
 #ifndef TC_HEADER_Boot_BootCommon
 #define TC_HEADER_Boot_BootCommon
 
-#include "Password.h"
+#include "Common/Password.h"
 #include "BootDefs.h"
 
+// The user will be advised to upgrade the rescue disk if upgrading from the following or any previous version
+#define TC_RESCUE_DISK_UPGRADE_NOTICE_MAX_VERSION 0x060a
 
 #define TC_BOOT_LOADER_AREA_SIZE (TC_BOOT_LOADER_AREA_SECTOR_COUNT * SECTOR_SIZE)
 
@@ -24,11 +26,14 @@
 #define TC_ORIG_BOOT_LOADER_BACKUP_SECTOR TC_BOOT_LOADER_AREA_SECTOR_COUNT
 #define TC_ORIG_BOOT_LOADER_BACKUP_SECTOR_OFFSET (TC_ORIG_BOOT_LOADER_BACKUP_SECTOR * SECTOR_SIZE)
 
+#define TC_BOOT_LOADER_BACKUP_RESCUE_DISK_SECTOR (TC_ORIG_BOOT_LOADER_BACKUP_SECTOR + TC_BOOT_LOADER_AREA_SECTOR_COUNT)
+#define TC_BOOT_LOADER_BACKUP_RESCUE_DISK_SECTOR_OFFSET (TC_BOOT_LOADER_BACKUP_RESCUE_DISK_SECTOR * SECTOR_SIZE)
+
 #define TC_MBR_SECTOR 0
 #define TC_MAX_MBR_BOOT_CODE_SIZE 440
 
-#define TC_BOOT_CFG_FLAG_RESCUE_DISK					0x10
-#define TC_BOOT_CFG_FLAG_RESCUE_DISK_ORIG_SYS_LOADER	0x20
+#define TC_MAX_EXTRA_BOOT_PARTITION_SIZE (256UL * 1024UL * 1024UL)
+
 
 #pragma pack (1)
 
@@ -50,8 +55,17 @@ typedef struct
 	uint16 CryptoInfoLength;
 	uint32 HeaderSaltCrc32;
 	Password BootPassword;
+	uint64 HiddenSystemPartitionStart;
+	uint64 DecoySystemPartitionStart;
+	uint32 Flags;
+
+	uint32 BootArgumentsCrc32;
+
 } BootArguments;
 
+// Modifying these values can introduce incompatibility with previous versions
+#define TC_BOOT_ARGS_FLAG_EXTRA_BOOT_PARTITION				0x1
+
 #pragma pack ()
 
 // Boot arguments signature should not be defined as a static string