VeraCrypt
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2019-12-13 00:07:25 +0100
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2019-12-13 00:08:17 +0100
commit1fd097c666be570fedf612ed7caa7e809881e072 (patch)
treedd654ffdb96fba0fab3703d823cab07b2336b6c8
parent2a93826497f10540034a430add272c1d71a25eba (diff)
downloadVeraCrypt-1fd097c666be570fedf612ed7caa7e809881e072.tar.gz
VeraCrypt-1fd097c666be570fedf612ed7caa7e809881e072.zip
Windows: check "TrueCrypt Mode" in password dialog when mounting a file container with .tc extension
Diffstat
-rw-r--r--src/Common/Dlgcode.c9
-rw-r--r--src/Common/Dlgcode.h1
-rw-r--r--src/Mount/Mount.c2
3 files changed, 11 insertions, 1 deletions
diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index 5e2dc39a..350e3f46 100644
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -7392,6 +7392,15 @@ BOOL CheckFileExtension (wchar_t *fileName)
7392 return FALSE; 7392 return FALSE;
7393} 7393}
7394 7394
7395BOOL IsTrueCryptFileExtension (wchar_t *fileName)
7396{
7397 wchar_t *ext = wcsrchr (fileName, L'.');
7398 if (ext && !_wcsicmp (ext, L".tc"))
7399 return TRUE;
7400 else
7401 return FALSE;
7402}
7403
7395void CorrectFileName (wchar_t* fileName) 7404void CorrectFileName (wchar_t* fileName)
7396{ 7405{
7397 /* replace '/' by '\' */ 7406 /* replace '/' by '\' */
diff --git a/src/Common/Dlgcode.h b/src/Common/Dlgcode.h
index 5da717fe..f387bf71 100644
--- a/src/Common/Dlgcode.h
+++ b/src/Common/Dlgcode.h
@@ -351,6 +351,7 @@ BOOL CloseVolumeExplorerWindows (HWND hwnd, int driveNo);
351BOOL UpdateDriveCustomLabel (int driveNo, wchar_t* effectiveLabel, BOOL bSetValue); 351BOOL UpdateDriveCustomLabel (int driveNo, wchar_t* effectiveLabel, BOOL bSetValue);
352BOOL CheckCapsLock (HWND hwnd, BOOL quiet); 352BOOL CheckCapsLock (HWND hwnd, BOOL quiet);
353BOOL CheckFileExtension (wchar_t *fileName); 353BOOL CheckFileExtension (wchar_t *fileName);
354BOOL IsTrueCryptFileExtension (wchar_t *fileName);
354void CorrectFileName (wchar_t* fileName); 355void CorrectFileName (wchar_t* fileName);
355void CorrectURL (wchar_t* fileName); 356void CorrectURL (wchar_t* fileName);
356void IncreaseWrongPwdRetryCount (int count); 357void IncreaseWrongPwdRetryCount (int count);
diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c
index 9130eaee..ac25ba58 100644
--- a/src/Mount/Mount.c
+++ b/src/Mount/Mount.c
@@ -5061,7 +5061,7 @@ static BOOL Mount (HWND hwndDlg, int nDosDriveNo, wchar_t *szFileName, int pim,
5061 else if (!Silent) 5061 else if (!Silent)
5062 { 5062 {
5063 int GuiPkcs5 = EffectiveVolumePkcs5; 5063 int GuiPkcs5 = EffectiveVolumePkcs5;
5064 BOOL GuiTrueCryptMode = EffectiveVolumeTrueCryptMode; 5064 BOOL GuiTrueCryptMode = EffectiveVolumeTrueCryptMode || IsTrueCryptFileExtension (szFileName)? TRUE : FALSE;
5065 int GuiPim = EffectiveVolumePim; 5065 int GuiPim = EffectiveVolumePim;
5066 StringCbCopyW (PasswordDlgVolume, sizeof(PasswordDlgVolume), szFileName); 5066 StringCbCopyW (PasswordDlgVolume, sizeof(PasswordDlgVolume), szFileName);
5067 5067