--- truecrypt/boot/windows/bootconfig.cpp 2018/04/24 16:58:43 1.1.1.3 +++ truecrypt/boot/windows/bootconfig.cpp 2018/04/24 17:07:34 1.1.1.7 @@ -1,9 +1,9 @@ /* - Copyright (c) 2008 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 2.8 the full text of which is contained in + the file License.txt included in TrueCrypt binary and source code distribution + packages. */ #include "BootConfig.h" @@ -16,7 +16,7 @@ bool BootDriveGeometryValid = false; bool PreventNormalSystemBoot = false; bool PreventBootMenu = false; char CustomUserMessage[TC_BOOT_SECTOR_USER_MESSAGE_MAX_LENGTH + 1]; -uint16 OuterVolumeBackupHeaderCrc; +uint32 OuterVolumeBackupHeaderCrc; bool BootStarted = false; @@ -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 () @@ -56,7 +56,7 @@ void ReadBootSectorUserConfiguration () DisableScreenOutput(); } - OuterVolumeBackupHeaderCrc = *(uint16 *) (SectorBuffer + TC_BOOT_SECTOR_OUTER_VOLUME_BAK_HEADER_CRC_OFFSET); + OuterVolumeBackupHeaderCrc = *(uint32 *) (SectorBuffer + TC_BOOT_SECTOR_OUTER_VOLUME_BAK_HEADER_CRC_OFFSET); ret: ReleaseSectorBuffer();