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

UNIX: make sector size mismatch error more verbose (#552) (#561)

Browse Source 
Signed-off-by: alt3r 3go <alt3r.3go@protonmail.com>
This commit is contained in:
alt3r 3go
2019-12-01 14:26:38 +01:00
committed by Mounir IDRASSI
parent b233e6776b
commit 1fd212016e
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Core/Unix/CoreUnix.cpp
View File

@@ -473,8 +473,10 @@ namespace VeraCrypt
if (options.Path->IsDevice()) if (options.Path->IsDevice())
{ {
if (volume->GetFile()->GetDeviceSectorSize() != volume->GetSectorSize()) const uint32 devSectorSize = volume->GetFile()->GetDeviceSectorSize();
throw ParameterIncorrect (SRC_POS); const size_t volSectorSize = volume->GetSectorSize();
if (devSectorSize != volSectorSize)
throw DeviceSectorSizeMismatch (SRC_POS, StringConverter::ToWide(devSectorSize) + L" != " + StringConverter::ToWide(volSectorSize));
} }
// Find a free mount point for FUSE service // Find a free mount point for FUSE service

1
src/Main/Forms/WaitDialog.cpp
View File

@@ -45,6 +45,7 @@ namespace VeraCrypt
VC_CONVERT_EXCEPTION (RootDeviceUnavailable); VC_CONVERT_EXCEPTION (RootDeviceUnavailable);
VC_CONVERT_EXCEPTION (DriveLetterUnavailable); VC_CONVERT_EXCEPTION (DriveLetterUnavailable);
VC_CONVERT_EXCEPTION (DriverError); VC_CONVERT_EXCEPTION (DriverError);
VC_CONVERT_EXCEPTION (DeviceSectorSizeMismatch);
VC_CONVERT_EXCEPTION (EncryptedSystemRequired); VC_CONVERT_EXCEPTION (EncryptedSystemRequired);
VC_CONVERT_EXCEPTION (HigherFuseVersionRequired); VC_CONVERT_EXCEPTION (HigherFuseVersionRequired);
VC_CONVERT_EXCEPTION (KernelCryptoServiceTestFailed); VC_CONVERT_EXCEPTION (KernelCryptoServiceTestFailed);

2
src/Main/UserInterface.cpp
View File

@@ -444,6 +444,7 @@ namespace VeraCrypt
{ {
#define EX2MSG(exception, message) do { if (ex == typeid (exception)) return (message); } while (false) #define EX2MSG(exception, message) do { if (ex == typeid (exception)) return (message); } while (false)
EX2MSG (DriveLetterUnavailable, LangString["DRIVE_LETTER_UNAVAILABLE"]); EX2MSG (DriveLetterUnavailable, LangString["DRIVE_LETTER_UNAVAILABLE"]);
EX2MSG (DeviceSectorSizeMismatch, _("Storage device and VC volume sector size mismatch"));
EX2MSG (EncryptedSystemRequired, _("This operation must be performed only when the system hosted on the volume is running.")); EX2MSG (EncryptedSystemRequired, _("This operation must be performed only when the system hosted on the volume is running."));
EX2MSG (ExternalException, LangString["EXCEPTION_OCCURRED"]); EX2MSG (ExternalException, LangString["EXCEPTION_OCCURRED"]);
EX2MSG (InsufficientData, _("Not enough data available.")); EX2MSG (InsufficientData, _("Not enough data available."));
@@ -1588,6 +1589,7 @@ namespace VeraCrypt
VC_CONVERT_EXCEPTION (RootDeviceUnavailable); VC_CONVERT_EXCEPTION (RootDeviceUnavailable);
VC_CONVERT_EXCEPTION (DriveLetterUnavailable); VC_CONVERT_EXCEPTION (DriveLetterUnavailable);
VC_CONVERT_EXCEPTION (DriverError); VC_CONVERT_EXCEPTION (DriverError);
VC_CONVERT_EXCEPTION (DeviceSectorSizeMismatch);
VC_CONVERT_EXCEPTION (EncryptedSystemRequired); VC_CONVERT_EXCEPTION (EncryptedSystemRequired);
VC_CONVERT_EXCEPTION (HigherFuseVersionRequired); VC_CONVERT_EXCEPTION (HigherFuseVersionRequired);
VC_CONVERT_EXCEPTION (KernelCryptoServiceTestFailed); VC_CONVERT_EXCEPTION (KernelCryptoServiceTestFailed);

1
src/Platform/Exception.h
View File

@@ -82,6 +82,7 @@ namespace VeraCrypt
TC_EXCEPTION_NODECL (ExecutedProcessFailed); \ TC_EXCEPTION_NODECL (ExecutedProcessFailed); \
TC_EXCEPTION (AlreadyInitialized); \ TC_EXCEPTION (AlreadyInitialized); \
TC_EXCEPTION (AssertionFailed); \ TC_EXCEPTION (AssertionFailed); \
TC_EXCEPTION (DeviceSectorSizeMismatch); \
TC_EXCEPTION (ExternalException); \ TC_EXCEPTION (ExternalException); \
TC_EXCEPTION (InsufficientData); \ TC_EXCEPTION (InsufficientData); \
TC_EXCEPTION (NotApplicable); \ TC_EXCEPTION (NotApplicable); \