diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2019-01-19 00:39:36 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2019-01-21 00:45:23 +0100 |
| commit | 27b3fee02d5242e743f87dd15db61d89073e8caa (patch) | |
| tree | 7639ed35f9457cf6c1e08576bcdb3863ef9789ac | |
| parent | 20463477755e5858441935ee18a6820c030df343 (diff) | |
| download | VeraCrypt-27b3fee02d5242e743f87dd15db61d89073e8caa.tar.gz VeraCrypt-27b3fee02d5242e743f87dd15db61d89073e8caa.zip | |
Windows: remove unused fields from CRYPTO_INFO structure
| -rw-r--r-- | src/Common/Crypto.h | 7 | ||||
| -rw-r--r-- | src/Common/Volumes.c | 5 | ||||
| -rw-r--r-- | src/Driver/DriveFilter.c | 3 |
3 files changed, 4 insertions, 11 deletions
diff --git a/src/Common/Crypto.h b/src/Common/Crypto.h index 07f6c069..6021c42f 100644 --- a/src/Common/Crypto.h +++ b/src/Common/Crypto.h @@ -245,18 +245,13 @@ typedef struct CRYPTO_INFO_t #ifndef TC_WINDOWS_BOOT uint16 HeaderVersion; - GfCtx gf_ctx; - CRYPTOPP_ALIGN_DATA(16) unsigned __int8 master_keydata[MASTER_KEYDATA_SIZE]; /* This holds the volume header area containing concatenated master key(s) and secondary key(s) (XTS mode). For LRW (deprecated/legacy), it contains the tweak key before the master key(s). For CBC (deprecated/legacy), it contains the IV seed before the master key(s). */ CRYPTOPP_ALIGN_DATA(16) unsigned __int8 k2[MASTER_KEYDATA_SIZE]; /* For XTS, this contains the secondary key (if cascade, multiple concatenated). For LRW (deprecated/legacy), it contains the tweak key. For CBC (deprecated/legacy), it contains the IV seed. */ - unsigned __int8 salt[PKCS5_SALT_SIZE]; + int noIterations; BOOL bTrueCryptMode; int volumePim; - uint64 volume_creation_time; // Legacy - uint64 header_creation_time; // Legacy - BOOL bProtectHiddenVolume; // Indicates whether the volume contains a hidden volume to be protected against overwriting BOOL bHiddenVolProtectionAction; // TRUE if a write operation has been denied by the driver in order to prevent the hidden volume from being overwritten (set to FALSE upon volume mount). diff --git a/src/Common/Volumes.c b/src/Common/Volumes.c index e49ce250..bcd5c40c 100644 --- a/src/Common/Volumes.c +++ b/src/Common/Volumes.c @@ -465,13 +465,13 @@ KeyReady: ; // Header version cryptoInfo->HeaderVersion = headerVersion; - +#if 0 // Volume creation time (legacy) cryptoInfo->volume_creation_time = GetHeaderField64 (header, TC_HEADER_OFFSET_VOLUME_CREATION_TIME).Value; // Header creation time (legacy) cryptoInfo->header_creation_time = GetHeaderField64 (header, TC_HEADER_OFFSET_MODIFICATION_TIME).Value; - +#endif // Hidden volume size (if any) cryptoInfo->hiddenVolumeSize = GetHeaderField64 (header, TC_HEADER_OFFSET_HIDDEN_VOLUME_SIZE).Value; @@ -529,7 +529,6 @@ KeyReady: ; memcpy (cryptoInfo->master_keydata, keyInfo.master_keydata, MASTER_KEYDATA_SIZE); // PKCS #5 - memcpy (cryptoInfo->salt, keyInfo.salt, PKCS5_SALT_SIZE); cryptoInfo->pkcs5 = pkcs5_prf; cryptoInfo->noIterations = keyInfo.noIterations; cryptoInfo->bTrueCryptMode = truecryptMode; diff --git a/src/Driver/DriveFilter.c b/src/Driver/DriveFilter.c index 1ed6f8a3..c1f38322 100644 --- a/src/Driver/DriveFilter.c +++ b/src/Driver/DriveFilter.c @@ -1135,8 +1135,7 @@ void ReopenBootVolumeHeader (PIRP irp, PIO_STACK_LOCATION irpSp) { Dump ("Header reopened\n"); ComputeBootLoaderFingerprint (BootDriveFilterExtension->LowerDeviceObject, header); - - BootDriveFilterExtension->Queue.CryptoInfo->header_creation_time = BootDriveFilterExtension->HeaderCryptoInfo->header_creation_time; + BootDriveFilterExtension->Queue.CryptoInfo->pkcs5 = BootDriveFilterExtension->HeaderCryptoInfo->pkcs5; BootDriveFilterExtension->Queue.CryptoInfo->noIterations = BootDriveFilterExtension->HeaderCryptoInfo->noIterations; BootDriveFilterExtension->Queue.CryptoInfo->volumePim = BootDriveFilterExtension->HeaderCryptoInfo->volumePim; |