diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Main/Forms/VolumePropertiesDialog.cpp | 4 | ||||
-rw-r--r-- | src/Main/UserInterface.cpp | 4 | ||||
-rw-r--r-- | src/Volume/Volume.cpp | 2 | ||||
-rw-r--r-- | src/Volume/VolumeInfo.cpp | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/Main/Forms/VolumePropertiesDialog.cpp b/src/Main/Forms/VolumePropertiesDialog.cpp index 2c2ae114..c5fa2dd8 100644 --- a/src/Main/Forms/VolumePropertiesDialog.cpp +++ b/src/Main/Forms/VolumePropertiesDialog.cpp @@ -64,10 +64,10 @@ namespace TrueCrypt AppendToList ("VOLUME_CREATE_DATE", Gui->VolumeTimeToString (volumeInfo.VolumeCreationTime)); 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 47663c2d..2637d6e6 100644 --- a/src/Main/UserInterface.cpp +++ b/src/Main/UserInterface.cpp @@ -275,10 +275,10 @@ namespace TrueCrypt prop << LangString["BLOCK_SIZE"] << L": " << blockSize.str() + L" " + LangString ["BITS"] << L'\n'; 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 ead76ed9..93a38e28 100644 --- a/src/Volume/Volume.cpp +++ b/src/Volume/Volume.cpp @@ -193,9 +193,9 @@ namespace TrueCrypt if (header->Decrypt (headerBuffer, *passwordKey, layout->GetSupportedKeyDerivationFunctions(), layoutEncryptionAlgorithms, layoutEncryptionModes)) { // 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); header->SetSize (layout->GetHeaderSize()); diff --git a/src/Volume/VolumeInfo.cpp b/src/Volume/VolumeInfo.cpp index 28c7f3f6..fb6da7e2 100644 --- a/src/Volume/VolumeInfo.cpp +++ b/src/Volume/VolumeInfo.cpp @@ -26,9 +26,9 @@ namespace TrueCrypt sr.Deserialize ("HeaderCreationTime", HeaderCreationTime); sr.Deserialize ("HiddenVolumeProtectionTriggered", HiddenVolumeProtectionTriggered); LoopDevice = sr.DeserializeWString ("LoopDevice"); - if (ProgramVersion >= 0x600) + if (ProgramVersion >= 0x10b) sr.Deserialize ("MinRequiredProgramVersion", MinRequiredProgramVersion); MountPoint = sr.DeserializeWString ("MountPoint"); Path = sr.DeserializeWString ("Path"); @@ -38,12 +38,12 @@ namespace TrueCrypt sr.Deserialize ("SerialInstanceNumber", SerialInstanceNumber); 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); sr.Deserialize ("TotalDataWritten", TotalDataWritten); |