diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-01-23 01:39:55 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-01-23 01:41:31 +0100 |
| commit | 89a9763b11c6e690b6517cff37f97c961503b789 (patch) | |
| tree | 8f83266f6c584da715a8ea0e4b3a46f5ed098987 /src/Common/Pkcs5.c | |
| parent | 1efb78266631d4c3aa0cd28e32485a9f2016f9de (diff) | |
| download | VeraCrypt-89a9763b11c6e690b6517cff37f97c961503b789.tar.gz VeraCrypt-89a9763b11c6e690b6517cff37f97c961503b789.zip | |
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)
Diffstat (limited to 'src/Common/Pkcs5.c')
| -rw-r--r-- | src/Common/Pkcs5.c | 5 |
1 files changed, 4 insertions, 1 deletions
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
|