diff options
| author | alt3r 3go <alt3r.3go@protonmail.com> | 2019-12-01 14:26:38 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2019-12-01 14:26:38 +0100 |
| commit | 1fd212016e867850267eea44bc09c8df1aff8ca4 (patch) | |
| tree | 2c3ec9ea44e0ddb78ed573a7a7b97e69e868234e /src | |
| parent | b233e6776b6113475676d05cec6f5b8f1318d2f5 (diff) | |
| download | VeraCrypt-1fd212016e867850267eea44bc09c8df1aff8ca4.tar.gz VeraCrypt-1fd212016e867850267eea44bc09c8df1aff8ca4.zip | |
UNIX: make sector size mismatch error more verbose (#552) (#561)
Signed-off-by: alt3r 3go <alt3r.3go@protonmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/Core/Unix/CoreUnix.cpp | 6 | ||||
| -rw-r--r-- | src/Main/Forms/WaitDialog.cpp | 1 | ||||
| -rw-r--r-- | src/Main/UserInterface.cpp | 2 | ||||
| -rw-r--r-- | src/Platform/Exception.h | 1 |
4 files changed, 8 insertions, 2 deletions
diff --git a/src/Core/Unix/CoreUnix.cpp b/src/Core/Unix/CoreUnix.cpp index 372c450f..423b5655 100644 --- a/src/Core/Unix/CoreUnix.cpp +++ b/src/Core/Unix/CoreUnix.cpp @@ -473,8 +473,10 @@ namespace VeraCrypt if (options.Path->IsDevice()) { - if (volume->GetFile()->GetDeviceSectorSize() != volume->GetSectorSize()) - throw ParameterIncorrect (SRC_POS); + const uint32 devSectorSize = volume->GetFile()->GetDeviceSectorSize(); + 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 diff --git a/src/Main/Forms/WaitDialog.cpp b/src/Main/Forms/WaitDialog.cpp index 32555d3b..2976a6e8 100644 --- a/src/Main/Forms/WaitDialog.cpp +++ b/src/Main/Forms/WaitDialog.cpp @@ -45,6 +45,7 @@ namespace VeraCrypt VC_CONVERT_EXCEPTION (RootDeviceUnavailable); VC_CONVERT_EXCEPTION (DriveLetterUnavailable); VC_CONVERT_EXCEPTION (DriverError); + VC_CONVERT_EXCEPTION (DeviceSectorSizeMismatch); VC_CONVERT_EXCEPTION (EncryptedSystemRequired); VC_CONVERT_EXCEPTION (HigherFuseVersionRequired); VC_CONVERT_EXCEPTION (KernelCryptoServiceTestFailed); diff --git a/src/Main/UserInterface.cpp b/src/Main/UserInterface.cpp index c124d18a..35396b46 100644 --- a/src/Main/UserInterface.cpp +++ b/src/Main/UserInterface.cpp @@ -444,6 +444,7 @@ namespace VeraCrypt { #define EX2MSG(exception, message) do { if (ex == typeid (exception)) return (message); } while (false) 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 (ExternalException, LangString["EXCEPTION_OCCURRED"]); EX2MSG (InsufficientData, _("Not enough data available.")); @@ -1588,6 +1589,7 @@ namespace VeraCrypt VC_CONVERT_EXCEPTION (RootDeviceUnavailable); VC_CONVERT_EXCEPTION (DriveLetterUnavailable); VC_CONVERT_EXCEPTION (DriverError); + VC_CONVERT_EXCEPTION (DeviceSectorSizeMismatch); VC_CONVERT_EXCEPTION (EncryptedSystemRequired); VC_CONVERT_EXCEPTION (HigherFuseVersionRequired); VC_CONVERT_EXCEPTION (KernelCryptoServiceTestFailed); diff --git a/src/Platform/Exception.h b/src/Platform/Exception.h index 71cfa1c5..b0f04bba 100644 --- a/src/Platform/Exception.h +++ b/src/Platform/Exception.h @@ -82,6 +82,7 @@ namespace VeraCrypt TC_EXCEPTION_NODECL (ExecutedProcessFailed); \ TC_EXCEPTION (AlreadyInitialized); \ TC_EXCEPTION (AssertionFailed); \ + TC_EXCEPTION (DeviceSectorSizeMismatch); \ TC_EXCEPTION (ExternalException); \ TC_EXCEPTION (InsufficientData); \ TC_EXCEPTION (NotApplicable); \ |