diff options
author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2024-08-24 17:53:44 +0200 |
---|---|---|
committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2024-09-29 21:06:06 +0200 |
commit | e5a0bf22b17d7d6c92d7793bed5d63d0e9e72e4c (patch) | |
tree | e37884982c93854cd787de63751ebeb0538148c2 /src/Common/Volumes.c | |
parent | 7735b983bf3794b033406a7bcbfb414faee86c09 (diff) | |
download | VeraCrypt-Argon2_1.26.13.tar.gz VeraCrypt-Argon2_1.26.13.zip |
Windows: Exclude Argon2 for System Encryption and from automatic detectionArgon2_1.26.13
Bootloader doesn't support Argon2 yet. We don't want to add overhead to automatic detection for now.
Diffstat (limited to 'src/Common/Volumes.c')
-rw-r--r-- | src/Common/Volumes.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/Common/Volumes.c b/src/Common/Volumes.c index a57a8319..0551f0b9 100644 --- a/src/Common/Volumes.c +++ b/src/Common/Volumes.c @@ -308,6 +308,14 @@ int ReadVolumeHeader (BOOL bBoot, char *encryptedHeader, Password *password, int // if a PRF is specified, we skip all other PRFs if (selected_pkcs5_prf != 0 && enqPkcs5Prf != selected_pkcs5_prf) continue; + + // we don't support Argon2 in pre-boot authentication + if (bBoot && (enqPkcs5Prf == ARGON2)) + continue; + + // For now, we don't included Argon2 in automatic detection + if (selected_pkcs5_prf == 0 && enqPkcs5Prf == ARGON2) + continue; #if !defined(_UEFI) if ((selected_pkcs5_prf == 0) && (encryptionThreadCount > 1)) @@ -923,6 +931,13 @@ int CreateVolumeHeaderInMemory (HWND hwndDlg, BOOL bBoot, char *header, int ea, if (pim < 0) pim = 0; + // we don't support Argon2 in pre-boot authentication + if (bBoot && (pkcs5_prf == ARGON2)) + { + crypto_close (cryptoInfo); + return ERR_PARAMETER_INCORRECT; + } + memset (header, 0, TC_VOLUME_HEADER_EFFECTIVE_SIZE); #if !defined(_UEFI) VirtualLock (&keyInfo, sizeof (keyInfo)); |