diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-11-30 11:35:41 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-11-30 13:58:19 +0100 |
| commit | efa436974d8203485eec6faa1bf0116bb32f6fcd (patch) | |
| tree | 97a5ef2eea0310a12db399151de7ca97dbd47ece /src/Main/Forms/VolumeCreationWizard.cpp | |
| parent | cfadb231d24bd292a6ea3708b776bde8f06e50ab (diff) | |
| download | VeraCrypt-efa436974d8203485eec6faa1bf0116bb32f6fcd.tar.gz VeraCrypt-efa436974d8203485eec6faa1bf0116bb32f6fcd.zip | |
Linux/MacOSX: Implement Unicode passwords suppport. Make validation of parameters in GUI more robust.
Diffstat (limited to 'src/Main/Forms/VolumeCreationWizard.cpp')
| -rw-r--r-- | src/Main/Forms/VolumeCreationWizard.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/Main/Forms/VolumeCreationWizard.cpp b/src/Main/Forms/VolumeCreationWizard.cpp index 177e4059..a7f52430 100644 --- a/src/Main/Forms/VolumeCreationWizard.cpp +++ b/src/Main/Forms/VolumeCreationWizard.cpp @@ -733,22 +733,21 @@ namespace VeraCrypt case Step::VolumePassword: { VolumePasswordWizardPage *page = dynamic_cast <VolumePasswordWizardPage *> (GetCurrentPage()); - Password = page->GetPassword(); + try + { + Password = page->GetPassword(); + } + catch (PasswordException& e) + { + Gui->ShowWarning (e); + return GetCurrentStep(); + } + Kdf = page->GetPkcs5Kdf(); Keyfiles = page->GetKeyfiles(); if (forward && Password && !Password->IsEmpty()) { - try - { - Password->CheckPortability(); - } - catch (UnportablePassword &e) - { - Gui->ShowError (e); - return GetCurrentStep(); - } - if (Password->Size() < VolumePassword::WarningSizeThreshold) { if (!Gui->AskYesNo (LangString["PASSWORD_LENGTH_WARNING"], false, true)) |