Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 02:58:02 -06:00
Code Activity

Change legacy version check in newly added Linux/MacOSX sources from 0x600 (TrueCrypt) to 0x10b

Browse Source
This commit is contained in:
Mounir IDRASSI
2014-06-16 19:11:12 +02:00
parent b9e34c30e8
commit b6dc9e9e15
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Main/Forms/VolumePropertiesDialog.cpp
View File

@@ -65,8 +65,8 @@ namespace TrueCrypt
AppendToList ("VOLUME_HEADER_DATE", Gui->VolumeTimeToString (volumeInfo.HeaderCreationTime));
#endif
AppendToList ("VOLUME_FORMAT_VERSION", StringConverter::ToWide (volumeInfo.MinRequiredProgramVersion < 0x600 ? 1 : 2));
AppendToList ("BACKUP_HEADER", LangString[volumeInfo.MinRequiredProgramVersion >= 0x600 ? "UISTR_YES" : "UISTR_NO"]);
AppendToList ("VOLUME_FORMAT_VERSION", StringConverter::ToWide (volumeInfo.MinRequiredProgramVersion < 0x10b ? 1 : 2));
AppendToList ("BACKUP_HEADER", LangString[volumeInfo.MinRequiredProgramVersion >= 0x10b ? "UISTR_YES" : "UISTR_NO"]);
#ifdef TC_LINUX
if (string (volumeInfo.VirtualDevice).find ("/dev/mapper/veracrypt") != 0)

4
src/Main/UserInterface.cpp
View File

@@ -276,8 +276,8 @@ namespace TrueCrypt
prop << LangString["MODE_OF_OPERATION"] << L": " << volume.EncryptionModeName << L'\n';
prop << LangString["PKCS5_PRF"] << L": " << volume.Pkcs5PrfName << L'\n';
prop << LangString["VOLUME_FORMAT_VERSION"] << L": " << (volume.MinRequiredProgramVersion < 0x600 ? 1 : 2) << L'\n';
prop << LangString["BACKUP_HEADER"] << L": " << LangString[volume.MinRequiredProgramVersion >= 0x600 ? "UISTR_YES" : "UISTR_NO"] << L'\n';
prop << LangString["VOLUME_FORMAT_VERSION"] << L": " << (volume.MinRequiredProgramVersion < 0x10b ? 1 : 2) << L'\n';
prop << LangString["BACKUP_HEADER"] << L": " << LangString[volume.MinRequiredProgramVersion >= 0x10b ? "UISTR_YES" : "UISTR_NO"] << L'\n';
#ifdef TC_LINUX
if (string (volume.VirtualDevice).find ("/dev/mapper/veracrypt") != 0)

2
src/Volume/Volume.cpp
View File

@@ -194,7 +194,7 @@ namespace TrueCrypt
{
// Header decrypted
if (typeid (*layout) == typeid (VolumeLayoutV2Normal) && header->GetRequiredMinProgramVersion() < 0x600)
if (typeid (*layout) == typeid (VolumeLayoutV2Normal) && header->GetRequiredMinProgramVersion() < 0x10b)
{
// VolumeLayoutV1Normal has been opened as VolumeLayoutV2Normal
layout.reset (new VolumeLayoutV1Normal);

6
src/Volume/VolumeInfo.cpp
View File

@@ -27,7 +27,7 @@ namespace TrueCrypt
sr.Deserialize ("HiddenVolumeProtectionTriggered", HiddenVolumeProtectionTriggered);
LoopDevice = sr.DeserializeWString ("LoopDevice");
if (ProgramVersion >= 0x600)
if (ProgramVersion >= 0x10b)
sr.Deserialize ("MinRequiredProgramVersion", MinRequiredProgramVersion);
MountPoint = sr.DeserializeWString ("MountPoint");
@@ -39,10 +39,10 @@ namespace TrueCrypt
sr.Deserialize ("Size", Size);
sr.Deserialize ("SlotNumber", SlotNumber);
if (ProgramVersion >= 0x620)
if (ProgramVersion >= 0x10b)
sr.Deserialize ("SystemEncryption", SystemEncryption);
if (ProgramVersion >= 0x600)
if (ProgramVersion >= 0x10b)
sr.Deserialize ("TopWriteOffset", TopWriteOffset);
sr.Deserialize ("TotalDataRead", TotalDataRead);