From 46652e90467000e591dbccbc31d3748382a60630 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sat, 22 Jun 2013 18:18:39 +0200 Subject: Change the required version in volume header to the one of VeraCrypt (now 1.0) --- src/Common/Volumes.c | 19 +------------------ src/Common/Volumes.h | 4 ++-- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/Common/Volumes.c b/src/Common/Volumes.c index 3b2c0ca7..3aadd970 100644 --- a/src/Common/Volumes.c +++ b/src/Common/Volumes.c @@ -798,24 +798,7 @@ int CreateVolumeHeaderInMemory (BOOL bBoot, char *header, int ea, int mode, Pass cryptoInfo->HeaderVersion = VOLUME_HEADER_VERSION; // Required program version to handle this volume - switch (mode) - { - case LRW: - // Deprecated/legacy - mputWord (p, 0x0410); - break; - case OUTER_CBC: - case INNER_CBC: - // Deprecated/legacy - mputWord (p, 0x0300); - break; - case CBC: - // Deprecated/legacy - mputWord (p, hiddenVolumeSize > 0 ? 0x0300 : 0x0100); - break; - default: - mputWord (p, requiredProgramVersion != 0 ? requiredProgramVersion : TC_VOLUME_MIN_REQUIRED_PROGRAM_VERSION); - } + mputWord (p, requiredProgramVersion != 0 ? requiredProgramVersion : TC_VOLUME_MIN_REQUIRED_PROGRAM_VERSION); // CRC of the master key data x = GetCrc32(keyInfo.master_keydata, MASTER_KEYDATA_SIZE); diff --git a/src/Common/Volumes.h b/src/Common/Volumes.h index 14e9868b..0b5116fd 100644 --- a/src/Common/Volumes.h +++ b/src/Common/Volumes.h @@ -21,11 +21,11 @@ extern "C" { // Version number written to volume header during format; // specifies the minimum program version required to mount the volume -#define TC_VOLUME_MIN_REQUIRED_PROGRAM_VERSION 0x0700 +#define TC_VOLUME_MIN_REQUIRED_PROGRAM_VERSION 0x0100 // Version number written (encrypted) to the key data area of an encrypted system partition/drive; // specifies the minimum program version required to decrypt the system partition/drive -#define TC_SYSENC_KEYSCOPE_MIN_REQ_PROG_VERSION 0x0700 +#define TC_SYSENC_KEYSCOPE_MIN_REQ_PROG_VERSION 0x0100 // Current volume format version (created by TrueCrypt 6.0+) #define TC_VOLUME_FORMAT_VERSION 2 -- cgit v1.2.3