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

Linux & MacOSX: automatically check TrueCryptMode in password dialog when selecting a container file that has the .tc file extension

Browse Source
This commit is contained in:
Mounir IDRASSI
2016-12-18 15:26:35 +01:00
parent a8fea1d643
commit 1ef6177ae3
5 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Main/Forms/ChangePasswordDialog.cpp
View File

@@ -24,6 +24,12 @@ namespace VeraCrypt
bool enableNewPassword = false;
bool enableNewKeyfiles = false;
bool enablePkcs5Prf = false;
bool isTrueCryptFile = false;
if (volumePath && volumePath->HasTrueCryptExtension ())
{
isTrueCryptFile = true;
}
switch (mode)
{
@@ -54,6 +60,7 @@ namespace VeraCrypt
CurrentPasswordPanel = new VolumePasswordPanel (this, NULL, password, false, keyfiles, false, true, true, false, true, true);
CurrentPasswordPanel->UpdateEvent.Connect (EventConnector <ChangePasswordDialog> (this, &ChangePasswordDialog::OnPasswordPanelUpdate));
CurrentPasswordPanel->SetTrueCryptMode (isTrueCryptFile);
CurrentPasswordPanelSizer->Add (CurrentPasswordPanel, 1, wxALL | wxEXPAND);
NewPasswordPanel = new VolumePasswordPanel (this, NULL, newPassword, true, newKeyfiles, false, enableNewPassword, enableNewKeyfiles, enableNewPassword, enablePkcs5Prf);

6
src/Main/Forms/MountOptionsDialog.cpp
View File

@@ -36,6 +36,12 @@ namespace VeraCrypt
PasswordPanel = new VolumePasswordPanel (this, &options, options.Password, disableMountOptions, options.Keyfiles, !disableMountOptions, true, true, false, true, true);
PasswordPanel->SetCacheCheckBoxValidator (wxGenericValidator (&Options.CachePassword));
if (options.Path && options.Path->HasTrueCryptExtension() && !disableMountOptions
&& !options.TrueCryptMode && (options.Pim <= 0))
{
PasswordPanel->SetTrueCryptMode (true);
}
PasswordSizer->Add (PasswordPanel, 1, wxALL | wxEXPAND);

10
src/Main/Forms/VolumePasswordPanel.cpp
View File

@@ -306,6 +306,16 @@ namespace VeraCrypt
{
return TrueCryptModeCheckBox->GetValue ();
}
void VolumePasswordPanel::SetTrueCryptMode (bool trueCryptMode)
{
bool bEnablePIM = !trueCryptMode;
TrueCryptModeCheckBox->SetValue (trueCryptMode);
PimCheckBox->Enable (bEnablePIM);
VolumePimStaticText->Enable (bEnablePIM);
VolumePimTextCtrl->Enable (bEnablePIM);
VolumePimHelpStaticText->Enable (bEnablePIM);
}
int VolumePasswordPanel::GetHeaderWipeCount () const
{

1
src/Main/Forms/VolumePasswordPanel.h
View File

@@ -32,6 +32,7 @@ namespace VeraCrypt
shared_ptr <Pkcs5Kdf> GetPkcs5Kdf (bool bTrueCryptMode, bool &bUnsupportedKdf) const;
int GetVolumePim () const;
bool GetTrueCryptMode () const;
void SetTrueCryptMode (bool trueCryptMode);
int GetHeaderWipeCount () const;
void SetCacheCheckBoxValidator (const wxGenericValidator &validator) { CacheCheckBox->SetValidator (validator); }
void SetFocusToPasswordTextCtrl () { PasswordTextCtrl->SetSelection (-1, -1); PasswordTextCtrl->SetFocus(); }