mirrors
/
VeraCrypt
mirror of https://github.com/veracrypt/VeraCrypt.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Linux/MacOSX: take into account keyfiles when comparing Outer and Hidden volumes passwords

This commit is contained in:
Mounir IDRASSI 2020-06-22 01:54:28 +02:00
parent a29c750030
commit b4465b80e6
No known key found for this signature in database
GPG Key ID: 02C30AE90FAE4A6F
1 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/Main/Forms/VolumeCreationWizard.cpp
View File

@ -774,16 +774,31 @@ namespace VeraCrypt
Kdf = page->GetPkcs5Kdf();
Keyfiles = page->GetKeyfiles();
if (forward && !OuterVolume && SelectedVolumeType == VolumeType::Hidden)
{
shared_ptr <VolumePassword> hiddenPassword;
try
{
hiddenPassword = Keyfile::ApplyListToPassword (Keyfiles, Password);
}
catch (...)
{
hiddenPassword = Password;
}
// check if Outer and Hidden passwords are the same
if ( (hiddenPassword && !hiddenPassword->IsEmpty() && OuterPassword && !OuterPassword->IsEmpty() && (*(OuterPassword.get()) == *(hiddenPassword.get())))
||
((!hiddenPassword || hiddenPassword->IsEmpty()) && (!OuterPassword || OuterPassword->IsEmpty()))
)
{
Gui->ShowError (_("The Hidden volume password can not be identical to the Outer volume password"));
return GetCurrentStep();
}
}
if (forward && Password && !Password->IsEmpty())
{
if (!OuterVolume && SelectedVolumeType == VolumeType::Hidden)
{
if (*(OuterPassword.get()) == *(Password.get()))
{
Gui->ShowError (_("The Hidden volume password can not be identical to the Outer volume password"));
return GetCurrentStep();
}
}
if (Password->Size() < VolumePassword::WarningSizeThreshold)
{
if (!Gui->AskYesNo (LangString["PASSWORD_LENGTH_WARNING"], false, true))
@ -1088,8 +1103,15 @@ namespace VeraCrypt
MaxHiddenVolumeSize -= MaxHiddenVolumeSize % outerVolume->GetSectorSize(); // Must be a multiple of the sector size
// remember Outer password in order to be able to compare it with Hidden password
OuterPassword = Password;
// remember Outer password and keyfiles in order to be able to compare it with those of Hidden volume
try
{
OuterPassword = Keyfile::ApplyListToPassword (Keyfiles, Password);
}
catch (...)
{
OuterPassword = Password;
}
}
catch (exception &e)
{