VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2014-06-16 17:11:12 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2014-11-08 22:20:01 (GMT)
commitb6dc9e9e159dd2cc9c328e888bbe9f970594a2f4 (patch)
treef9d0aeb61ae3f89affe236d27c162274bbc49940 /src
parentb9e34c30e827f4936caf00b1b6a0b85e93d80a01 (diff)
downloadVeraCrypt-b6dc9e9e159dd2cc9c328e888bbe9f970594a2f4.zip
VeraCrypt-b6dc9e9e159dd2cc9c328e888bbe9f970594a2f4.tar.gz
Change legacy version check in newly added Linux/MacOSX sources from 0x600 (TrueCrypt) to 0x10b
Diffstat (limited to 'src')
-rw-r--r--src/Main/Forms/VolumePropertiesDialog.cpp4
-rw-r--r--src/Main/UserInterface.cpp4
-rw-r--r--src/Volume/Volume.cpp2
-rw-r--r--src/Volume/VolumeInfo.cpp6
4 files changed, 8 insertions, 8 deletions
diff --git a/src/Main/Forms/VolumePropertiesDialog.cpp b/src/Main/Forms/VolumePropertiesDialog.cpp
index 2c2ae11..c5fa2dd 100644
--- a/src/Main/Forms/VolumePropertiesDialog.cpp
+++ b/src/Main/Forms/VolumePropertiesDialog.cpp
@@ -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)
diff --git a/src/Main/UserInterface.cpp b/src/Main/UserInterface.cpp
index 47663c2..2637d6e 100644
--- a/src/Main/UserInterface.cpp
+++ b/src/Main/UserInterface.cpp
@@ -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)
diff --git a/src/Volume/Volume.cpp b/src/Volume/Volume.cpp
index ead76ed..93a38e2 100644
--- a/src/Volume/Volume.cpp
+++ b/src/Volume/Volume.cpp
@@ -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);
diff --git a/src/Volume/VolumeInfo.cpp b/src/Volume/VolumeInfo.cpp
index 28c7f3f..fb6da7e 100644
--- a/src/Volume/VolumeInfo.cpp
+++ b/src/Volume/VolumeInfo.cpp
@@ -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);