Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 11:08:02 -06:00
Code Activity

Windows: Fix warning in driver build by make get_pkcs5_iteration_count have a single return statement at the end

Browse Source
This commit is contained in:
Mounir IDRASSI
2024-11-15 11:15:41 +01:00
parent fc4a544180
commit 21e61c8ded
1 changed files with 39 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/Common/Pkcs5.c
View File

@@ -1179,53 +1179,49 @@ wchar_t *get_pkcs5_prf_name (int pkcs5_prf_id)
int get_pkcs5_iteration_count (int pkcs5_prf_id, int pim, BOOL bBoot)
int get_pkcs5_iteration_count(int pkcs5_prf_id, int pim, BOOL bBoot)
{
if ( (pim < 0)
)
int iteration_count = 0;
if (pim >= 0)
{
return 0;
switch (pkcs5_prf_id)
{
case BLAKE2S:
if (pim == 0)
iteration_count = bBoot ? 200000 : 500000;
else
iteration_count = bBoot ? pim * 2048 : 15000 + pim * 1000;
break;
case SHA512:
iteration_count = (pim == 0) ? 500000 : 15000 + pim * 1000;
break;
case WHIRLPOOL:
iteration_count = (pim == 0) ? 500000 : 15000 + pim * 1000;
break;
case SHA256:
if (pim == 0)
iteration_count = bBoot ? 200000 : 500000;
else
iteration_count = bBoot ? pim * 2048 : 15000 + pim * 1000;
break;
case STREEBOG:
if (pim == 0)
iteration_count = bBoot ? 200000 : 500000;
else
iteration_count = bBoot ? pim * 2048 : 15000 + pim * 1000;
break;
default:
TC_THROW_FATAL_EXCEPTION; // Unknown/wrong ID
}
}
switch (pkcs5_prf_id)
{
case BLAKE2S:
if (pim == 0)
return bBoot? 200000 : 500000;
else
{
return bBoot? pim * 2048 : 15000 + pim * 1000;
}
case SHA512:
return ((pim == 0)? 500000 : 15000 + pim * 1000);
case WHIRLPOOL:
return ((pim == 0)? 500000 : 15000 + pim * 1000);
case SHA256:
if (pim == 0)
return bBoot? 200000 : 500000;
else
{
return bBoot? pim * 2048 : 15000 + pim * 1000;
}
case STREEBOG:
if (pim == 0)
return bBoot? 200000 : 500000;
else
{
return bBoot? pim * 2048 : 15000 + pim * 1000;
}
default:
TC_THROW_FATAL_EXCEPTION; // Unknown/wrong ID
}
return 0;
return iteration_count;
}
int is_pkcs5_prf_supported (int pkcs5_prf_id, PRF_BOOT_TYPE bootType)