Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 19:08:26 -06:00
Code Activity

Windows: change cascade encryption naming format to reflex mathematical composition of the encryption algorithm, thus being more clear. For example AES(Twofish(Serpent)) instead of AES-Twofish-Serpent.

Browse Source
This commit is contained in:
Mounir IDRASSI
2015-01-03 22:57:24 +01:00
parent 8f5fd67ff3
commit 55b3400afa
7 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Common/Crypto.c
View File

@@ -408,19 +408,35 @@ BOOL EAInitMode (PCRYPTO_INFO ci)
return TRUE;
}
static void EAGetDisplayName(char *buf, int ea, int i)
{
strcpy (buf, CipherGetName (i));
if (i = EAGetPreviousCipher(ea, i))
{
strcat (buf, "(");
EAGetDisplayName (&buf[strlen(buf)], ea, i);
strcat (buf, ")");
}
}
// Returns name of EA, cascaded cipher names are separated by hyphens
char *EAGetName (char *buf, int ea)
char *EAGetName (char *buf, int ea, int guiDisplay)
{
int i = EAGetLastCipher(ea);
strcpy (buf, (i != 0) ? CipherGetName (i) : "?");
while (i = EAGetPreviousCipher(ea, i))
if (guiDisplay)
{
strcat (buf, "-");
strcat (buf, CipherGetName (i));
EAGetDisplayName (buf, ea, EAGetLastCipher(ea));
}
else
{
int i = EAGetLastCipher(ea);
strcpy (buf, (i != 0) ? CipherGetName (i) : "?");
while (i = EAGetPreviousCipher(ea, i))
{
strcat (buf, "-");
strcat (buf, CipherGetName (i));
}
}
return buf;
}
@@ -432,7 +448,7 @@ int EAGetByName (char *name)
do
{
EAGetName (n, ea);
EAGetName (n, ea, 0);
if (strcmp (n, name) == 0)
return ea;
}