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

Windows: change command line switch for PRF selection to /hash in order to match its value on Linux/MacOSX. Support hash names with and without the '-' character.

Browse Source
This commit is contained in:
Mounir IDRASSI
2014-12-19 18:39:51 +01:00
parent 07156b6c09
commit 94737b2a7a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mount/Mount.c
View File

@@ -6804,7 +6804,7 @@ void ExtractCommandLine (HWND hwndDlg, char *lpszCommandLine)
{ OptionTokenLib, "/tokenlib", NULL, FALSE }, { OptionTokenLib, "/tokenlib", NULL, FALSE },
{ OptionVolume, "/volume", "/v", FALSE }, { OptionVolume, "/volume", "/v", FALSE },
{ CommandWipeCache, "/wipecache", "/w", FALSE }, { CommandWipeCache, "/wipecache", "/w", FALSE },
{ OptionPkcs5, "/prf", NULL , FALSE } { OptionPkcs5, "/hash", NULL , FALSE }
}; };
argumentspec as; argumentspec as;
@@ -7009,13 +7009,13 @@ void ExtractCommandLine (HWND hwndDlg, char *lpszCommandLine)
if (HAS_ARGUMENT == GetArgumentValue (lpszCommandLineArgs, if (HAS_ARGUMENT == GetArgumentValue (lpszCommandLineArgs,
nArgPos, &i, nNoCommandLineArgs, szTmp, sizeof (szTmp))) nArgPos, &i, nNoCommandLineArgs, szTmp, sizeof (szTmp)))
{ {
if (_stricmp(szTmp, "sha512") == 0) if (_stricmp(szTmp, "sha512") == 0 || _stricmp(szTmp, "sha-512") == 0)
CmdVolumePkcs5 = SHA512; CmdVolumePkcs5 = SHA512;
else if (_stricmp(szTmp, "whirlpool") == 0) else if (_stricmp(szTmp, "whirlpool") == 0)
CmdVolumePkcs5 = WHIRLPOOL; CmdVolumePkcs5 = WHIRLPOOL;
else if (_stricmp(szTmp, "sha256") == 0) else if (_stricmp(szTmp, "sha256") == 0 || _stricmp(szTmp, "sha-256") == 0)
CmdVolumePkcs5 = SHA256; CmdVolumePkcs5 = SHA256;
else if (_stricmp(szTmp, "ripemd160") == 0) else if (_stricmp(szTmp, "ripemd160") == 0 || _stricmp(szTmp, "ripemd-160") == 0)
CmdVolumePkcs5 = RIPEMD160; CmdVolumePkcs5 = RIPEMD160;
else else
{ {