diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-02 14:45:22 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-04 13:14:05 +0200 |
| commit | b261177b8f5bc3f8495406d13dc03c0328b930f9 (patch) | |
| tree | 535b8a6345c63529b3bc72f42d02c27c6aed64e3 /src/Main/Forms/VolumePasswordPanel.cpp | |
| parent | 0b914c8f5d690dfc1bdfbca1e1083372c5ed84d8 (diff) | |
| download | VeraCrypt-b261177b8f5bc3f8495406d13dc03c0328b930f9.tar.gz VeraCrypt-b261177b8f5bc3f8495406d13dc03c0328b930f9.zip | |
Windows/Linux/MacOSX: Set maximum PIM value to 2147468 in order to avoid having negative values for iterations count using the formula 15000 + (PIM x 1000). Add specific error message to XML language files.
Diffstat (limited to 'src/Main/Forms/VolumePasswordPanel.cpp')
| -rw-r--r-- | src/Main/Forms/VolumePasswordPanel.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Main/Forms/VolumePasswordPanel.cpp b/src/Main/Forms/VolumePasswordPanel.cpp index 16fafa3a..27d66bd8 100644 --- a/src/Main/Forms/VolumePasswordPanel.cpp +++ b/src/Main/Forms/VolumePasswordPanel.cpp @@ -63,6 +63,7 @@ namespace VeraCrypt EnablePimEntry = enablePassword && (!enableConfirmation || (enablePkcs5Prf && !isMountPassword)); PimCheckBox->Show (EnablePimEntry); VolumePimStaticText->Show (false); + VolumePimTextCtrl->SetMaxLength (MAX_PIM_DIGITS); VolumePimTextCtrl->Show (false); VolumePimHelpStaticText->Show (false); @@ -198,7 +199,7 @@ namespace VeraCrypt int colspan = isPim? 1 : 2; wxTextCtrl *newTextCtrl = new wxTextCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, display ? 0 : wxTE_PASSWORD); - newTextCtrl->SetMaxLength (isPim? 10 : VolumePassword::MaxSize); + newTextCtrl->SetMaxLength (isPim? MAX_PIM_DIGITS : VolumePassword::MaxSize); newTextCtrl->SetValue ((*textCtrl)->GetValue()); newTextCtrl->SetMinSize ((*textCtrl)->GetSize()); @@ -279,7 +280,8 @@ namespace VeraCrypt if (pimStr.IsEmpty()) return 0; if (((size_t) wxNOT_FOUND == pimStr.find_first_not_of (wxT("0123456789"))) - && pimStr.ToLong (&pim)) + && pimStr.ToLong (&pim) + && pim <= MAX_PIM_VALUE) return (int) pim; else return -1; |