From 94737b2a7a06c58d72d97c0247ab63f3f35168af Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Fri, 19 Dec 2014 18:39:51 +0100 Subject: [PATCH] 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. --- src/Mount/Mount.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c index e33fe752..f6fa82fa 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 {