--- truecrypt/boot/windows/bootconfig.cpp	2018/04/24 17:01:42	1.1.1.4
+++ truecrypt/boot/windows/bootconfig.cpp	2018/04/24 17:09:41	1.1.1.8
@@ -1,9 +1,9 @@
 /*
- Copyright (c) 2008-2009 TrueCrypt Foundation. All rights reserved.
+ Copyright (c) 2008-2009 TrueCrypt Developers Association. All rights reserved.
 
- Governed by the TrueCrypt License 2.6 the full text of which is contained
- in the file License.txt included in TrueCrypt binary and source code
- distribution packages.
+ Governed by the TrueCrypt License 3.0 the full text of which is contained in
+ the file License.txt included in TrueCrypt binary and source code distribution
+ packages.
 */
 
 #include "BootConfig.h"
@@ -27,10 +27,10 @@ Partition EncryptedVirtualPartition;
 
 Partition ActivePartition;
 Partition PartitionFollowingActive;
+bool ExtraBootPartitionPresent = false;
 uint64 HiddenVolumeStartUnitNo;
 uint64 HiddenVolumeStartSector;
 
-
 #ifndef TC_WINDOWS_BOOT_RESCUE_DISK_MODE
 
 void ReadBootSectorUserConfiguration ()
@@ -43,6 +43,11 @@ void ReadBootSectorUserConfiguration ()
 		goto ret;
 
 	userConfig = SectorBuffer[TC_BOOT_SECTOR_USER_CONFIG_OFFSET];
+
+#ifdef TC_WINDOWS_BOOT_AES
+	EnableHwEncryption (!(userConfig & TC_BOOT_USER_CFG_FLAG_DISABLE_HW_ENCRYPTION));
+#endif
+
 	PreventBootMenu = (userConfig & TC_BOOT_USER_CFG_FLAG_DISABLE_ESC);
 
 	memcpy (CustomUserMessage, SectorBuffer + TC_BOOT_SECTOR_USER_MESSAGE_OFFSET, TC_BOOT_SECTOR_USER_MESSAGE_MAX_LENGTH);
@@ -55,7 +60,7 @@ void ReadBootSectorUserConfiguration ()
 		
 		DisableScreenOutput();
 	}
-	
+
 	OuterVolumeBackupHeaderCrc = *(uint32 *) (SectorBuffer + TC_BOOT_SECTOR_OUTER_VOLUME_BAK_HEADER_CRC_OFFSET);
 
 ret: