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

Windows: in function CreateVolumeHeaderInMemory, properly unlock and erase sensitive stack memory.

Browse Source
This commit is contained in:
Mounir IDRASSI 2016-10-01 22:54:48 +02:00
parent 8e2c5ca45e
commit 34f3c055ed
No known key found for this signature in database
GPG Key ID: DD0C382D5FCFB8FC
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Common/Volumes.c
View File

@ -870,7 +870,8 @@ int CreateVolumeHeaderInMemory (HWND hwndDlg, BOOL bBoot, char *header, int ea,
#endif
{
crypto_close (cryptoInfo);
return ERR_CIPHER_INIT_WEAK_KEY;
retVal = ERR_CIPHER_INIT_WEAK_KEY;
goto err;
}
}
else
@ -912,7 +913,8 @@ int CreateVolumeHeaderInMemory (HWND hwndDlg, BOOL bBoot, char *header, int ea,
#endif
{
crypto_close (cryptoInfo);
return ERR_CIPHER_INIT_WEAK_KEY;
retVal = ERR_CIPHER_INIT_WEAK_KEY;
goto err;
}
if (password)
@ -961,7 +963,8 @@ int CreateVolumeHeaderInMemory (HWND hwndDlg, BOOL bBoot, char *header, int ea,
#endif
{
crypto_close (cryptoInfo);
return ERR_CIPHER_INIT_WEAK_KEY;
retVal = ERR_CIPHER_INIT_WEAK_KEY;
goto err;
}
}
@ -1045,14 +1048,15 @@ int CreateVolumeHeaderInMemory (HWND hwndDlg, BOOL bBoot, char *header, int ea,
if (retVal != ERR_SUCCESS)
{
crypto_close (cryptoInfo);
return retVal;
goto err;
}
// Mode of operation
if (!EAInitMode (cryptoInfo))
{
crypto_close (cryptoInfo);
return ERR_OUTOFMEMORY;
retVal = ERR_OUTOFMEMORY;
goto err;
}
@ -1069,7 +1073,7 @@ int CreateVolumeHeaderInMemory (HWND hwndDlg, BOOL bBoot, char *header, int ea,
if (retVal != ERR_SUCCESS)
{
crypto_close (cryptoInfo);
return retVal;
goto err;
}
memcpy (cryptoInfo->master_keydata, keyInfo.master_keydata, MASTER_KEYDATA_SIZE);
@ -1086,7 +1090,8 @@ int CreateVolumeHeaderInMemory (HWND hwndDlg, BOOL bBoot, char *header, int ea,
if (!EAInitMode (cryptoInfo))
{
crypto_close (cryptoInfo);
return ERR_OUTOFMEMORY;
retVal = ERR_OUTOFMEMORY;
goto err;
}
@ -1132,10 +1137,16 @@ int CreateVolumeHeaderInMemory (HWND hwndDlg, BOOL bBoot, char *header, int ea,
}
#endif // #ifdef VOLFORMAT
*retInfo = cryptoInfo;
err:
burn (dk, sizeof(dk));
burn (&keyInfo, sizeof (keyInfo));
#if !defined(_UEFI)
VirtualUnlock (&keyInfo, sizeof (keyInfo));
VirtualUnlock (&dk, sizeof (dk));
#endif // !defined(_UEFI)
*retInfo = cryptoInfo;
return 0;
}