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: change cascade encryption naming format in the UI as it was done on Windows.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Volume/EncryptionAlgorithm.cpp
View File

@@ -125,19 +125,33 @@ namespace VeraCrypt
return Mode;
}
wstring EncryptionAlgorithm::GetName () const
wstring EncryptionAlgorithm::GetName (bool forGuiDisplay) const
{
if (Ciphers.size() < 1)
throw NotInitialized (SRC_POS);
wstring name;
int depth = 0;
foreach_reverse_ref (const Cipher &c, Ciphers)
{
if (name.empty())
name = c.GetName();
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;

2
src/Volume/EncryptionAlgorithm.h
View File

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