VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/ExpandVolume
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2016-12-08 17:06:52 +0100
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2016-12-08 17:53:28 +0100
commit4262d4feb71aaade721ae5d06eec63ac07144a8f (patch)
tree2ea6df1dc4f31e7a6c11600b22f8e9a896b71b53 /src/ExpandVolume
parente131d7a6070bbeb6b406fbaa54f8528e0dcace89 (diff)
downloadVeraCrypt-4262d4feb71aaade721ae5d06eec63ac07144a8f.tar.gz
VeraCrypt-4262d4feb71aaade721ae5d06eec63ac07144a8f.zip
Windows: Enhancement to favorites handling. Add PRF/TrueCryptMode fields in favorites management dialog, and use default mount parameters when mounting multiple favorites at once.
Diffstat (limited to 'src/ExpandVolume')
-rw-r--r--src/ExpandVolume/WinMain.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ExpandVolume/WinMain.cpp b/src/ExpandVolume/WinMain.cpp
index 42aa6a70..3172a45f 100644
--- a/src/ExpandVolume/WinMain.cpp
+++ b/src/ExpandVolume/WinMain.cpp
@@ -686,9 +686,9 @@ BOOL CALLBACK ExtcvPasswordDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
*pim = GetPim (hwndDlg, IDC_PIM);
- /* SHA-256 is not supported by TrueCrypt */
+ /* check that PRF is supported in TrueCrypt Mode */
if ( (*truecryptMode)
- && ((*pkcs5 == SHA256) || (mountOptions.ProtectHiddenVolume && mountOptions.ProtectedHidVolPkcs5Prf == SHA256))
+ && ((!is_pkcs5_prf_supported(*pkcs5, TRUE, PRF_BOOT_NO)) || (mountOptions.ProtectHiddenVolume && !is_pkcs5_prf_supported(mountOptions.ProtectedHidVolPkcs5Prf, TRUE, PRF_BOOT_NO)))
)
{
Error ("ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE", hwndDlg);