eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-13 11:50:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing incorrect offsets for data/IV with TCRYPT system-encryption with a detached header

Browse Source 
Related: #587
This commit is contained in:
Klaus Zipfel
2021-05-26 09:41:08 +02:00
parent a8bb07ae9f
commit b7a07efdcf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tcrypt/tcrypt.c
View File

@@ -1033,7 +1033,7 @@ uint64_t TCRYPT_get_data_offset(struct crypt_device *cd,
/* No real header loaded, initialized by active device, use default mk_offset */ /* No real header loaded, initialized by active device, use default mk_offset */
} else if (params->flags & CRYPT_TCRYPT_SYSTEM_HEADER) { } else if (params->flags & CRYPT_TCRYPT_SYSTEM_HEADER) {
/* Mapping through whole device, not partition! */ /* Mapping through whole device, not partition! */
if (crypt_dev_is_partition(device_path(crypt_metadata_device(cd)))) if (crypt_dev_is_partition(device_path(crypt_data_device(cd))))
return 0; return 0;
} else if (params->mode && !strncmp(params->mode, "xts", 3)) { } else if (params->mode && !strncmp(params->mode, "xts", 3)) {
if (hdr->d.version < 3) if (hdr->d.version < 3)
@@ -1071,7 +1071,7 @@ uint64_t TCRYPT_get_iv_offset(struct crypt_device *cd,
iv_offset = hdr->d.mk_offset / SECTOR_SIZE; iv_offset = hdr->d.mk_offset / SECTOR_SIZE;
if (params->flags & CRYPT_TCRYPT_SYSTEM_HEADER) if (params->flags & CRYPT_TCRYPT_SYSTEM_HEADER)
iv_offset += crypt_dev_partition_offset(device_path(crypt_metadata_device(cd))); iv_offset += crypt_dev_partition_offset(device_path(crypt_data_device(cd)));
return iv_offset; return iv_offset;
} }