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

Add alignment constants for derived key and KEY_INFO buffers to ensure SIMD compatibility. (#1526)

Browse Source
This commit is contained in:
Bernard Ladenthin
2025-04-21 11:26:34 +02:00
committed by GitHub
parent 5eb358ca18
commit 0478be3626
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Common/Volumes.c
View File

@@ -173,11 +173,11 @@ int ReadVolumeHeader (BOOL bBoot, unsigned char *encryptedHeader, Password *pass
{ {
unsigned char header[TC_VOLUME_HEADER_EFFECTIVE_SIZE]; unsigned char header[TC_VOLUME_HEADER_EFFECTIVE_SIZE];
unsigned char* keyInfoBuffer = NULL; unsigned char* keyInfoBuffer = NULL;
int keyInfoBufferSize = sizeof (KEY_INFO) + 16; int keyInfoBufferSize = sizeof (KEY_INFO) + TC_KEY_INFO_BUFFER_ALIGNMENT;
size_t keyInfoBufferOffset; size_t keyInfoBufferOffset;
PKEY_INFO keyInfo; PKEY_INFO keyInfo;
PCRYPTO_INFO cryptoInfo; PCRYPTO_INFO cryptoInfo;
CRYPTOPP_ALIGN_DATA(16) unsigned char dk[MASTER_KEYDATA_SIZE]; CRYPTOPP_ALIGN_DATA(TC_DERIVED_KEY_BUFFER_ALIGNMENT) unsigned char dk[MASTER_KEYDATA_SIZE];
int enqPkcs5Prf, pkcs5_prf; int enqPkcs5Prf, pkcs5_prf;
uint16 headerVersion; uint16 headerVersion;
int status = ERR_PARAMETER_INCORRECT; int status = ERR_PARAMETER_INCORRECT;
@@ -199,7 +199,7 @@ int ReadVolumeHeader (BOOL bBoot, unsigned char *encryptedHeader, Password *pass
keyInfoBuffer = TCalloc(keyInfoBufferSize); keyInfoBuffer = TCalloc(keyInfoBufferSize);
if (!keyInfoBuffer) if (!keyInfoBuffer)
return ERR_OUTOFMEMORY; return ERR_OUTOFMEMORY;
keyInfoBufferOffset = 16 - (((uint64) keyInfoBuffer) % 16); keyInfoBufferOffset = TC_KEY_INFO_BUFFER_ALIGNMENT - (((uint64) keyInfoBuffer) % TC_KEY_INFO_BUFFER_ALIGNMENT);
keyInfo = (PKEY_INFO) (keyInfoBuffer + keyInfoBufferOffset); keyInfo = (PKEY_INFO) (keyInfoBuffer + keyInfoBufferOffset);
#if !defined(DEVICE_DRIVER) && !defined(_UEFI) #if !defined(DEVICE_DRIVER) && !defined(_UEFI)
@@ -884,7 +884,7 @@ int CreateVolumeHeaderInMemory (HWND hwndDlg, BOOL bBoot, unsigned char *header,
#endif // !defined(_UEFI) #endif // !defined(_UEFI)
{ {
unsigned char *p = header; unsigned char *p = header;
static CRYPTOPP_ALIGN_DATA(16) KEY_INFO keyInfo; static CRYPTOPP_ALIGN_DATA(TC_KEY_INFO_BUFFER_ALIGNMENT) KEY_INFO keyInfo;
int nUserKeyLen = password? password->Length : 0; int nUserKeyLen = password? password->Length : 0;
PCRYPTO_INFO cryptoInfo = crypto_open (); PCRYPTO_INFO cryptoInfo = crypto_open ();

6
src/Common/Volumes.h
View File

@@ -35,6 +35,12 @@ extern "C" {
// specifies the minimum program version required to decrypt the system partition/drive // specifies the minimum program version required to decrypt the system partition/drive
#define TC_SYSENC_KEYSCOPE_MIN_REQ_PROG_VERSION 0x010b #define TC_SYSENC_KEYSCOPE_MIN_REQ_PROG_VERSION 0x010b
// Required 16-byte alignment for derived key buffers to ensure optimal performance and compatibility with SIMD instructions.
#define TC_DERIVED_KEY_BUFFER_ALIGNMENT 16
// Required 16-byte alignment for KEY_INFO buffer to ensure optimal performance and compatibility with SIMD instructions.
#define TC_KEY_INFO_BUFFER_ALIGNMENT 16
// Current volume format version (created by TrueCrypt 6.0+) // Current volume format version (created by TrueCrypt 6.0+)
#define TC_VOLUME_FORMAT_VERSION 2 #define TC_VOLUME_FORMAT_VERSION 2