Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 19:08:26 -06:00
Code Activity

Windows: Protect against using a container file as its own keyfile. Normalizing path names to never use '/' but always '\'.

Browse Source
This commit is contained in:
Mounir IDRASSI
2015-08-24 01:31:30 +02:00
parent 20cb199e55
commit ad3b8eca69
9 changed files with 95 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Common/Keyfiles.c
View File

@@ -222,7 +222,7 @@ close:
}
BOOL KeyFilesApply (HWND hwndDlg, Password *password, KeyFile *firstKeyFile)
BOOL KeyFilesApply (HWND hwndDlg, Password *password, KeyFile *firstKeyFile, const char* volumeFileName)
{
BOOL status = TRUE;
KeyFile kfSubStruct;
@@ -322,7 +322,7 @@ BOOL KeyFilesApply (HWND hwndDlg, Password *password, KeyFile *firstKeyFile)
StringCbPrintfA (kfSub->FileName, sizeof(kfSub->FileName), "%s%c%s", kf->FileName,
'\\',
fBuf.name
);
);
// Determine whether it's a path or a file
if (stat (kfSub->FileName, &statStruct) != 0)
@@ -346,6 +346,13 @@ BOOL KeyFilesApply (HWND hwndDlg, Password *password, KeyFile *firstKeyFile)
continue;
}
CorrectFileName (kfSub->FileName);
if (volumeFileName && (_stricmp (volumeFileName, kfSub->FileName) == 0))
{
// skip if it is the current container file name
continue;
}
++keyfileCount;
// Apply keyfile to the pool
@@ -474,13 +481,25 @@ BOOL CALLBACK KeyFilesDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
{
if (SelectMultipleFiles (hwndDlg, "SELECT_KEYFILE", kf->FileName, sizeof(kf->FileName),bHistory))
{
bool containerFileSkipped = false;
do
{
param->FirstKeyFile = KeyFileAdd (param->FirstKeyFile, kf);
LoadKeyList (hwndDlg, param->FirstKeyFile);
CorrectFileName (kf->FileName);
if (_stricmp (param->VolumeFileName, kf->FileName) == 0)
containerFileSkipped = true;
else
{
param->FirstKeyFile = KeyFileAdd (param->FirstKeyFile, kf);
LoadKeyList (hwndDlg, param->FirstKeyFile);
kf = (KeyFile *) malloc (sizeof (KeyFile));
kf = (KeyFile *) malloc (sizeof (KeyFile));
}
} while (SelectMultipleFilesNext (kf->FileName, sizeof(kf->FileName)));
if (containerFileSkipped)
{
Warning ("SELECTED_KEYFILE_IS_CONTAINER_FILE", hwndDlg);
}
}
free (kf);