diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2022-12-11 13:01:14 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2022-12-11 13:01:14 +0100 |
| commit | 44c9c077f379e65ef45952e1e78059cdec2fa36f (patch) | |
| tree | 809378a9c00b2ef9b40e49617c3d4b612d81b6ef /src/Common/Password.c | |
| parent | c0ff7a7c521b1d658316d9a177383ab0c403007a (diff) | |
| download | VeraCrypt-44c9c077f379e65ef45952e1e78059cdec2fa36f.tar.gz VeraCrypt-44c9c077f379e65ef45952e1e78059cdec2fa36f.zip | |
Revert "New sys enc wizard (#957)"
This reverts commit c0ff7a7c521b1d658316d9a177383ab0c403007a.
Diffstat (limited to 'src/Common/Password.c')
| -rw-r--r-- | src/Common/Password.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Common/Password.c b/src/Common/Password.c index 3c9faa82..4caf3a21 100644 --- a/src/Common/Password.c +++ b/src/Common/Password.c @@ -39,7 +39,6 @@ void VerifyPasswordAndUpdate (HWND hwndDlg, HWND hButton, HWND hPassword, char szTmp1Utf8[MAX_PASSWORD + 1]; char szTmp2Utf8[MAX_PASSWORD + 1]; int k = GetWindowTextLength (hPassword); - int j = GetWindowTextLength (hVerify); BOOL bEnable = FALSE; int utf8Len1, utf8Len2; @@ -52,12 +51,7 @@ void VerifyPasswordAndUpdate (HWND hwndDlg, HWND hButton, HWND hPassword, utf8Len2 = WideCharToMultiByte (CP_UTF8, 0, szTmp2, -1, szTmp2Utf8, MAX_PASSWORD + 1, NULL, NULL); if (wcscmp (szTmp1, szTmp2) != 0) - { bEnable = FALSE; - if(k > 0 && j == k) - Warning ("WARNING_PASSWORD_NOT_IDENTICAL", hwndDlg); - - } else if (utf8Len1 <= 0) bEnable = FALSE; else @@ -151,6 +145,11 @@ BOOL CheckPasswordLength (HWND hwndDlg, unsigned __int32 passwordLength, int pim Error (bootPimCondition? "BOOT_PIM_REQUIRE_LONG_PASSWORD": "PIM_REQUIRE_LONG_PASSWORD", hwndDlg); return FALSE; } + +#ifndef _DEBUG + if (!bSkipPasswordWarning && (MessageBoxW (hwndDlg, GetString ("PASSWORD_LENGTH_WARNING"), lpszTitle, MB_YESNO|MB_ICONWARNING|MB_DEFBUTTON2) != IDYES)) + return FALSE; +#endif } #ifndef _DEBUG else if (bCustomPimSmall) @@ -564,3 +563,4 @@ error: return nStatus; } + |