From 89a9763b11c6e690b6517cff37f97c961503b789 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Fri, 23 Jan 2015 01:39:55 +0100 Subject: Windows: Correct displaying wrong TrueCrypt mode in volume properties when SHA-256 is used. Issue reported and fixed by user Ache on CodePlex (https://veracrypt.codeplex.com/workitem/65) --- src/Common/Pkcs5.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/Common/Pkcs5.c b/src/Common/Pkcs5.c index e522a360..396e3625 100644 --- a/src/Common/Pkcs5.c +++ b/src/Common/Pkcs5.c @@ -683,7 +683,10 @@ int get_pkcs5_iteration_count (int pkcs5_prf_id, BOOL truecryptMode, BOOL bBoot) return truecryptMode? 1000 : 500000; case SHA256: - return bBoot? 200000 : 500000; + if (truecryptMode) + return 0; // SHA-256 not supported by TrueCrypt + else + return bBoot? 200000 : 500000; default: TC_THROW_FATAL_EXCEPTION; // Unknown/wrong ID -- cgit v1.2.3