From 58cff70724e9d90902a33b0718ccbe8ee4c7b329 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Tue, 9 Aug 2016 14:39:09 +0200 Subject: Linux/MacOSX: Add help text for GOST89 and Kuznyechik --- src/Main/Forms/EncryptionOptionsWizardPage.cpp | 4 ++++ src/Main/GraphicUserInterface.cpp | 20 ++++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) (limited to 'src/Main') diff --git a/src/Main/Forms/EncryptionOptionsWizardPage.cpp b/src/Main/Forms/EncryptionOptionsWizardPage.cpp index 13d21cb3..f7216b80 100644 --- a/src/Main/Forms/EncryptionOptionsWizardPage.cpp +++ b/src/Main/Forms/EncryptionOptionsWizardPage.cpp @@ -80,6 +80,10 @@ namespace VeraCrypt EncryptionAlgorithmStaticText->SetLabel (LangString["TWOFISH_HELP"]); else if (typeid (*ea) == typeid (Camellia)) EncryptionAlgorithmStaticText->SetLabel (LangString["CAMELLIA_HELP"]); + else if (typeid (*ea) == typeid (GOST89)) + EncryptionAlgorithmStaticText->SetLabel (LangString["GOST89_HELP"]); + else if (typeid (*ea) == typeid (Kuznyechik)) + EncryptionAlgorithmStaticText->SetLabel (LangString["KUZNYECHIK_HELP"]); else EncryptionAlgorithmStaticText->SetLabel (L""); } diff --git a/src/Main/GraphicUserInterface.cpp b/src/Main/GraphicUserInterface.cpp index a9ea6cfd..77a9524d 100644 --- a/src/Main/GraphicUserInterface.cpp +++ b/src/Main/GraphicUserInterface.cpp @@ -537,12 +537,12 @@ namespace VeraCrypt { virtual void operator() (string &passwordStr) { - if (CmdLine->ArgTokenPin && CmdLine->ArgTokenPin->IsAllocated ()) - { - passwordStr.clear(); - passwordStr.insert (0, (char*) CmdLine->ArgTokenPin->Ptr (), CmdLine->ArgTokenPin->Size()); - return; - } + if (CmdLine->ArgTokenPin && CmdLine->ArgTokenPin->IsAllocated ()) + { + passwordStr.clear(); + passwordStr.insert (0, (char*) CmdLine->ArgTokenPin->Ptr (), CmdLine->ArgTokenPin->Size()); + return; + } if (Gui->GetPreferences().NonInteractive) throw MissingArgument (SRC_POS); @@ -1163,6 +1163,14 @@ namespace VeraCrypt { url = L"https://veracrypt.codeplex.com/wikipage?title=Camellia"; } + else if (linkId == L"GOST89") + { + url = L"https://veracrypt.codeplex.com/wikipage?title=GOST89"; + } + else if (linkId == L"Kuznyechik") + { + url = L"https://veracrypt.codeplex.com/wikipage?title=Kuznyechik"; + } else if (linkId == L"cascades") { url = L"https://veracrypt.codeplex.com/wikipage?title=Cascades"; -- cgit v1.2.3