nihilist/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt synced 2024-12-01 07:23:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Windows: Add command line switch parameter for temporary caching of password during favorites mounting (/cache favorites). Correct implementation of "/cache y".

Browse Source
This commit is contained in:
Mounir IDRASSI 2015-06-07 23:04:54 +02:00
parent c3c1bdd29d
commit 00cd134720
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Mount/Mount.c
View File

@ -83,6 +83,7 @@ char commandLineDrive = 0;
BOOL bCacheInDriver = FALSE; /* Cache any passwords we see */ BOOL bCacheInDriver = FALSE; /* Cache any passwords we see */
BOOL bCacheInDriverDefault = FALSE; BOOL bCacheInDriverDefault = FALSE;
BOOL bCacheDuringMultipleMount = FALSE; BOOL bCacheDuringMultipleMount = FALSE;
BOOL bCmdCacheDuringMultipleMount = FALSE;
BOOL bHistoryCmdLine = FALSE; /* History control is always disabled */ BOOL bHistoryCmdLine = FALSE; /* History control is always disabled */
BOOL bUseDifferentTrayIconIfVolMounted = TRUE; BOOL bUseDifferentTrayIconIfVolMounted = TRUE;
BOOL bCloseDismountedWindows=TRUE; /* Close all open explorer windows of dismounted volume */ BOOL bCloseDismountedWindows=TRUE; /* Close all open explorer windows of dismounted volume */
@ -4037,6 +4038,7 @@ static BOOL Mount (HWND hwndDlg, int nDosDriveNo, char *szFileName, int pin)
int mounted = 0, EffectiveVolumePkcs5 = CmdVolumePkcs5; int mounted = 0, EffectiveVolumePkcs5 = CmdVolumePkcs5;
BOOL EffectiveVolumeTrueCryptMode = CmdVolumeTrueCryptMode; BOOL EffectiveVolumeTrueCryptMode = CmdVolumeTrueCryptMode;
int EffectiveVolumePin = (pin < 0)? CmdVolumePin : pin; int EffectiveVolumePin = (pin < 0)? CmdVolumePin : pin;
BOOL bEffectiveCacheDuringMultipleMount = bCmdCacheDuringMultipleMount? TRUE: bCacheDuringMultipleMount;
/* Priority is given to command line parameters /* Priority is given to command line parameters
* Default values used only when nothing specified in command line * Default values used only when nothing specified in command line
@ -4115,7 +4117,7 @@ static BOOL Mount (HWND hwndDlg, int nDosDriveNo, char *szFileName, int pin)
} }
// Test password and/or keyfiles used for the previous volume // Test password and/or keyfiles used for the previous volume
if (!mounted && bCacheDuringMultipleMount && MultipleMountOperationInProgress && VolumePassword.Length != 0) if (!mounted && bEffectiveCacheDuringMultipleMount && MultipleMountOperationInProgress && VolumePassword.Length != 0)
{ {
// try TrueCrypt mode first as it is quick, only if pin = 0 // try TrueCrypt mode first as it is quick, only if pin = 0
if (EffectiveVolumePin == 0) if (EffectiveVolumePin == 0)
@ -7604,7 +7606,7 @@ void ExtractCommandLine (HWND hwndDlg, char *lpszCommandLine)
case OptionCache: case OptionCache:
{ {
char szTmp[8] = {0}; char szTmp[16] = {0};
bCacheInDriver = TRUE; bCacheInDriver = TRUE;
if (HAS_ARGUMENT == GetArgumentValue (lpszCommandLineArgs, &i, nNoCommandLineArgs, if (HAS_ARGUMENT == GetArgumentValue (lpszCommandLineArgs, &i, nNoCommandLineArgs,
@ -7613,7 +7615,12 @@ void ExtractCommandLine (HWND hwndDlg, char *lpszCommandLine)
if (!_stricmp(szTmp,"n") || !_stricmp(szTmp,"no")) if (!_stricmp(szTmp,"n") || !_stricmp(szTmp,"no"))
bCacheInDriver = FALSE; bCacheInDriver = FALSE;
else if (!_stricmp(szTmp,"y") || !_stricmp(szTmp,"yes")) else if (!_stricmp(szTmp,"y") || !_stricmp(szTmp,"yes"))
bCacheInDriver = TRUE;
else if (!_stricmp(szTmp,"f") || !_stricmp(szTmp,"favorites"))
{
bCacheInDriver = FALSE; bCacheInDriver = FALSE;
bCmdCacheDuringMultipleMount = TRUE;
}
else else
AbortProcess ("COMMAND_LINE_ERROR"); AbortProcess ("COMMAND_LINE_ERROR");
} }