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

Linux/MacOSX: change cascade encryption naming format in the UI as it was done on Windows.

This commit is contained in:
Mounir IDRASSI 2015-01-04 00:54:24 +01:00
parent 9a31c23881
commit cbc28bd4fe
6 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Main/Forms/BenchmarkDialog.cpp
View File

@ -73,7 +73,7 @@ namespace VeraCrypt
if (!ea->IsDeprecated()) if (!ea->IsDeprecated())
{ {
BenchmarkResult result; BenchmarkResult result;
result.AlgorithmName = ea->GetName(); result.AlgorithmName = ea->GetName(true);
Buffer key (ea->GetKeySize()); Buffer key (ea->GetKeySize());
ea->SetKey (key); ea->SetKey (key);

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

@ -24,7 +24,7 @@ namespace VeraCrypt
foreach (shared_ptr <EncryptionAlgorithm> ea, EncryptionAlgorithms) foreach (shared_ptr <EncryptionAlgorithm> ea, EncryptionAlgorithms)
{ {
if (!ea->IsDeprecated()) if (!ea->IsDeprecated())
EncryptionAlgorithmChoice->Append (ea->GetName(), ea.get()); EncryptionAlgorithmChoice->Append (ea->GetName(true), ea.get());
} }
EncryptionAlgorithmChoice->Select (0); EncryptionAlgorithmChoice->Select (0);
@ -124,7 +124,7 @@ namespace VeraCrypt
{ {
if (algorithm) if (algorithm)
{ {
EncryptionAlgorithmChoice->SetStringSelection (algorithm->GetName()); EncryptionAlgorithmChoice->SetStringSelection (algorithm->GetName(true));
OnEncryptionAlgorithmSelected (); OnEncryptionAlgorithmSelected ();
} }
} }

2
src/Main/Forms/EncryptionTestDialog.cpp
View File

@ -21,7 +21,7 @@ namespace VeraCrypt
foreach (shared_ptr <EncryptionAlgorithm> ea, EncryptionAlgorithms) foreach (shared_ptr <EncryptionAlgorithm> ea, EncryptionAlgorithms)
{ {
if (!ea->IsDeprecated()) if (!ea->IsDeprecated())
EncryptionAlgorithmChoice->Append (ea->GetName(), ea.get()); EncryptionAlgorithmChoice->Append (ea->GetName(true), ea.get());
} }
EncryptionAlgorithmChoice->Select (0); EncryptionAlgorithmChoice->Select (0);

2
src/Main/TextUserInterface.cpp
View File

@ -664,7 +664,7 @@ namespace VeraCrypt
{ {
if (!ea->IsDeprecated()) if (!ea->IsDeprecated())
{ {
ShowString (StringFormatter (L" {0}) {1}\n", (uint32) encryptionAlgorithms.size() + 1, ea->GetName())); ShowString (StringFormatter (L" {0}) {1}\n", (uint32) encryptionAlgorithms.size() + 1, ea->GetName(true)));
encryptionAlgorithms.push_back (ea); encryptionAlgorithms.push_back (ea);
} }
} }

18
src/Volume/EncryptionAlgorithm.cpp
View File

@ -125,19 +125,33 @@ namespace VeraCrypt
return Mode; return Mode;
} }
wstring EncryptionAlgorithm::GetName () const wstring EncryptionAlgorithm::GetName (bool forGuiDisplay) const
{ {
if (Ciphers.size() < 1) if (Ciphers.size() < 1)
throw NotInitialized (SRC_POS); throw NotInitialized (SRC_POS);
wstring name; wstring name;
int depth = 0;
foreach_reverse_ref (const Cipher &c, Ciphers) foreach_reverse_ref (const Cipher &c, Ciphers)
{ {
if (name.empty()) if (name.empty())
name = c.GetName(); name = c.GetName();
else else
name += wstring (L"-") + c.GetName(); {
depth++;
if (forGuiDisplay)
name += wstring (L"(");
else
name += wstring (L"-");
name += c.GetName();
}
}
if (forGuiDisplay && depth)
{
for (int i = 0; i < depth; i++)
name += wstring(L")");
} }
return name; return name;

2
src/Volume/EncryptionAlgorithm.h
View File

@ -37,7 +37,7 @@ namespace VeraCrypt
static size_t GetLargestKeySize (const EncryptionAlgorithmList &algorithms); static size_t GetLargestKeySize (const EncryptionAlgorithmList &algorithms);
virtual size_t GetKeySize () const; virtual size_t GetKeySize () const;
virtual shared_ptr <EncryptionMode> GetMode () const; virtual shared_ptr <EncryptionMode> GetMode () const;
virtual wstring GetName () const; virtual wstring GetName (bool forGuiDisplay = false) const;
bool IsDeprecated () const { return Deprecated; } bool IsDeprecated () const { return Deprecated; }
virtual bool IsModeSupported (const EncryptionMode &mode) const; virtual bool IsModeSupported (const EncryptionMode &mode) const;
virtual bool IsModeSupported (const shared_ptr <EncryptionMode> mode) const; virtual bool IsModeSupported (const shared_ptr <EncryptionMode> mode) const;