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

Simplify LUKS2 sector_size helpers.

Browse Source
This commit is contained in:
Ondrej Kozina
2022-06-10 14:23:30 +02:00
parent e23992d531
commit 75e429b8d1
5 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/luks2/luks2_json_metadata.c
View File

@@ -2235,15 +2235,9 @@ int LUKS2_get_volume_key_size(struct luks2_hdr *hdr, int segment)
return -1;
}
int LUKS2_get_sector_size(struct luks2_hdr *hdr)
uint32_t LUKS2_get_sector_size(struct luks2_hdr *hdr)
{
json_object *jobj_segment;
jobj_segment = LUKS2_get_segment_jobj(hdr, CRYPT_DEFAULT_SEGMENT);
if (!jobj_segment)
return SECTOR_SIZE;
return json_segment_get_sector_size(jobj_segment) ?: SECTOR_SIZE;
return json_segment_get_sector_size(LUKS2_get_segment_jobj(hdr, CRYPT_DEFAULT_SEGMENT));
}
int LUKS2_assembly_multisegment_dmd(struct crypt_device *cd,