diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-06-02 00:10:39 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-06-02 00:12:00 +0200 |
| commit | 76d3bc631eff60841026f2526d69f6d661d218a3 (patch) | |
| tree | cecc43976a8c45029b35b08ba3af0819ebee3993 /src/Main | |
| parent | 99c4031d89ce4f72e3899b3cac660082a1820a48 (diff) | |
| download | VeraCrypt-76d3bc631eff60841026f2526d69f6d661d218a3.tar.gz VeraCrypt-76d3bc631eff60841026f2526d69f6d661d218a3.zip | |
Crypto: Add support for Japanese encryption standard Camellia, including for system encryption.
Diffstat (limited to 'src/Main')
| -rw-r--r-- | src/Main/Forms/EncryptionOptionsWizardPage.cpp | 2 | ||||
| -rw-r--r-- | src/Main/GraphicUserInterface.cpp | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/Main/Forms/EncryptionOptionsWizardPage.cpp b/src/Main/Forms/EncryptionOptionsWizardPage.cpp index 5af01d02..13d21cb3 100644 --- a/src/Main/Forms/EncryptionOptionsWizardPage.cpp +++ b/src/Main/Forms/EncryptionOptionsWizardPage.cpp @@ -78,6 +78,8 @@ namespace VeraCrypt EncryptionAlgorithmStaticText->SetLabel (LangString["SERPENT_HELP"]); else if (typeid (*ea) == typeid (Twofish)) EncryptionAlgorithmStaticText->SetLabel (LangString["TWOFISH_HELP"]); + else if (typeid (*ea) == typeid (Camellia)) + EncryptionAlgorithmStaticText->SetLabel (LangString["CAMELLIA_HELP"]); else EncryptionAlgorithmStaticText->SetLabel (L""); } diff --git a/src/Main/GraphicUserInterface.cpp b/src/Main/GraphicUserInterface.cpp index b302b715..a9ea6cfd 100644 --- a/src/Main/GraphicUserInterface.cpp +++ b/src/Main/GraphicUserInterface.cpp @@ -1159,6 +1159,10 @@ namespace VeraCrypt { url = L"https://veracrypt.codeplex.com/wikipage?title=Twofish"; } + else if (linkId == L"camellia") + { + url = L"https://veracrypt.codeplex.com/wikipage?title=Camellia"; + } else if (linkId == L"cascades") { url = L"https://veracrypt.codeplex.com/wikipage?title=Cascades"; |