mirrors/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2026-05-22 04:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use "KDF" instead of "PKCS5 PRF" for UI selection of KDF to use

Browse Source
This commit is contained in:
Mounir IDRASSI
2025-08-08 22:53:04 +09:00
parent 04648bc5ee
commit 54c39e4eb2
65 changed files with 244 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Main/Forms/Forms.cpp
View File

@@ -769,7 +769,7 @@ BenchmarkDialogBase::BenchmarkDialogBase( wxWindow* parent, wxWindowID id, const
m_staticText70->Wrap( -1 );
fgSizer9->Add( m_staticText70, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
wxString BenchmarkChoiceChoices[] = { _("ENCRYPTION_ALGORITHM"), _("PKCS5_PRF"), _("IDT_HASH_ALGO") };
wxString BenchmarkChoiceChoices[] = { _("ENCRYPTION_ALGORITHM"), _("KDF"), _("IDT_HASH_ALGO") };
int BenchmarkChoiceNChoices = sizeof( BenchmarkChoiceChoices ) / sizeof( wxString );
BenchmarkChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, BenchmarkChoiceNChoices, BenchmarkChoiceChoices, 0 );
BenchmarkChoice->SetSelection( 0 );
@@ -1913,7 +1913,7 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
wxBoxSizer* bSizer163;
bSizer163 = new wxBoxSizer( wxHORIZONTAL );
Pkcs5PrfStaticText = new wxStaticText( sbSizer15->GetStaticBox(), wxID_ANY, _("PKCS5_PRF"), wxDefaultPosition, wxDefaultSize, 0 );
Pkcs5PrfStaticText = new wxStaticText( sbSizer15->GetStaticBox(), wxID_ANY, _("KDF"), wxDefaultPosition, wxDefaultSize, 0 );
Pkcs5PrfStaticText->Wrap( -1 );
bSizer163->Add( Pkcs5PrfStaticText, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
@@ -2694,7 +2694,7 @@ EncryptionOptionsWizardPageBase::EncryptionOptionsWizardPageBase( wxWindow* pare
bSizer95->Add( sbSizer29, 1, wxEXPAND|wxALL, 5 );
wxStaticBoxSizer* sbSizer30;
sbSizer30 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("IDT_HASH_ALGO") ), wxHORIZONTAL );
sbSizer30 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("KDF") ), wxHORIZONTAL );
wxArrayString HashChoiceChoices;
HashChoice = new wxChoice( sbSizer30->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, HashChoiceChoices, 0 );
@@ -3412,7 +3412,7 @@ VolumePasswordPanelBase::VolumePasswordPanelBase( wxWindow* parent, wxWindowID i
GridBagSizer->Add( Pkcs5PrfSizer, wxGBPosition( 8, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxTOP|wxBOTTOM, 5 );
Pkcs5PrfStaticText = new wxStaticText( this, wxID_ANY, _("IDT_NEW_PKCS5_PRF"), wxDefaultPosition, wxDefaultSize, 0 );
Pkcs5PrfStaticText = new wxStaticText( this, wxID_ANY, _("IDT_NEW_KDF"), wxDefaultPosition, wxDefaultSize, 0 );
Pkcs5PrfStaticText->Wrap( -1 );
GridBagSizer->Add( Pkcs5PrfStaticText, wxGBPosition( 9, 0 ), wxGBSpan( 1, 1 ), wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );

6
src/Main/Forms/TrueCrypt.fbp
View File

@@ -3595,7 +3595,7 @@
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="choices">&quot;ENCRYPTION_ALGORITHM&quot; &quot;PKCS5_PRF&quot; &quot;IDT_HASH_ALGO&quot;</property>
<property name="choices">&quot;ENCRYPTION_ALGORITHM&quot; &quot;KDF&quot; &quot;IDT_HASH_ALGO&quot;</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
@@ -11973,7 +11973,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">PKCS5_PRF</property>
<property name="label">KDF</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
@@ -21959,7 +21959,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">IDT_NEW_PKCS5_PRF</property>
<property name="label">IDT_NEW_KDF</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>

4
src/Main/Forms/VolumePropertiesDialog.cpp
View File

@@ -62,9 +62,9 @@ namespace VeraCrypt
AppendToList ("BLOCK_SIZE", blockSize.str() + L" " + LangString ["BITS"]);
AppendToList ("MODE_OF_OPERATION", volumeInfo.EncryptionModeName);
if (volumeInfo.Pim <= 0)
AppendToList ("PKCS5_PRF", volumeInfo.Pkcs5PrfName);
AppendToList ("KDF", volumeInfo.Pkcs5PrfName);
else
AppendToList ("PKCS5_PRF", StringFormatter (L"{0} (Dynamic)", volumeInfo.Pkcs5PrfName));
AppendToList ("KDF", StringFormatter (L"{0} (Dynamic)", volumeInfo.Pkcs5PrfName));
#if 0
AppendToList ("PKCS5_ITERATIONS", StringConverter::FromNumber (volumeInfo.Pkcs5IterationCount));

4
src/Main/UserInterface.cpp
View File

@@ -290,7 +290,7 @@ namespace VeraCrypt
prop << LangString["BLOCK_SIZE"] << L": " << blockSize.str() + L" " + LangString ["BITS"] << L'\n';
prop << LangString["MODE_OF_OPERATION"] << L": " << volume.EncryptionModeName << L'\n';
prop << LangString["PKCS5_PRF"] << L": " << volume.Pkcs5PrfName << L'\n';
prop << LangString["KDF"] << L": " << volume.Pkcs5PrfName << L'\n';
prop << LangString["VOLUME_FORMAT_VERSION"] << L": " << (volume.MinRequiredProgramVersion < 0x10b ? 1 : 2) << L'\n';
prop << LangString["BACKUP_HEADER"] << L": " << LangString[volume.MinRequiredProgramVersion >= 0x10b ? "UISTR_YES" : "UISTR_NO"] << L'\n';
@@ -1184,7 +1184,7 @@ const FileManager fileManagers[] = {
"\n"
"-C, --change [VOLUME_PATH]\n"
" Change a password and/or keyfile(s) of a volume. Most options are requested\n"
" from the user if not specified on command line. PKCS-5 PRF HMAC hash\n"
" from the user if not specified on command line. KDF hash\n"
" algorithm can be changed with option --hash. See also options -k,\n"
" --new-keyfiles, --new-password, -p, --random-source.\n"
"\n"