VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Mount
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2014-12-19 17:39:51 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2014-12-19 17:41:43 (GMT)
commit94737b2a7a06c58d72d97c0247ab63f3f35168af (patch)
tree5dd6d5a66c0121c959b98ce42a1812d5ac061800 /src/Mount
parent07156b6c09165cf61a6bd499d26151d1f32bf3a9 (diff)
downloadVeraCrypt-94737b2a7a06c58d72d97c0247ab63f3f35168af.zip
VeraCrypt-94737b2a7a06c58d72d97c0247ab63f3f35168af.tar.gz
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.
Diffstat (limited to 'src/Mount')
-rw-r--r--src/Mount/Mount.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c
index e33fe75..f6fa82f 100644
--- a/src/Mount/Mount.c
+++ b/src/Mount/Mount.c
@@ -6804,7 +6804,7 @@ void ExtractCommandLine (HWND hwndDlg, char *lpszCommandLine)
{ OptionTokenLib, "/tokenlib", NULL, FALSE },
{ OptionVolume, "/volume", "/v", FALSE },
{ CommandWipeCache, "/wipecache", "/w", FALSE },
- { OptionPkcs5, "/prf", NULL , FALSE }
+ { OptionPkcs5, "/hash", NULL , FALSE }
};
argumentspec as;
@@ -7009,13 +7009,13 @@ void ExtractCommandLine (HWND hwndDlg, char *lpszCommandLine)
if (HAS_ARGUMENT == GetArgumentValue (lpszCommandLineArgs,
nArgPos, &i, nNoCommandLineArgs, szTmp, sizeof (szTmp)))
{
- if (_stricmp(szTmp, "sha512") == 0)
+ if (_stricmp(szTmp, "sha512") == 0 || _stricmp(szTmp, "sha-512") == 0)
CmdVolumePkcs5 = SHA512;
else if (_stricmp(szTmp, "whirlpool") == 0)
CmdVolumePkcs5 = WHIRLPOOL;
- else if (_stricmp(szTmp, "sha256") == 0)
+ else if (_stricmp(szTmp, "sha256") == 0 || _stricmp(szTmp, "sha-256") == 0)
CmdVolumePkcs5 = SHA256;
- else if (_stricmp(szTmp, "ripemd160") == 0)
+ else if (_stricmp(szTmp, "ripemd160") == 0 || _stricmp(szTmp, "ripemd-160") == 0)
CmdVolumePkcs5 = RIPEMD160;
else
{