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

Move integrity fields in json_segment_create_crypt segment helper.

Browse Source 
The integrity is optional parameter of dm-crypt segment definition.
Move the low level json code in appropriate json helper.

It will make adding new segment easier. The future hw-opal-crypt
segment will inherit all crypt fields.
This commit is contained in:
Ondrej Kozina
2023-04-03 16:39:13 +02:00
parent 926679f7f1
commit fd91de82ad
4 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/luks2/luks2_json_format.c
View File

@@ -213,7 +213,7 @@ int LUKS2_generate_hdr(
uint64_t metadata_size_bytes,
uint64_t keyslots_size_bytes)
{
struct json_object *jobj_segment, *jobj_integrity, *jobj_keyslots, *jobj_segments, *jobj_config;
struct json_object *jobj_segment, *jobj_keyslots, *jobj_segments, *jobj_config;
char cipher[128];
uuid_t partitionUuid;
int r, digest;
@@ -293,25 +293,12 @@ int LUKS2_generate_hdr(
goto err;
}
jobj_segment = json_segment_create_crypt(data_offset, 0, NULL, cipher, sector_size, 0);
jobj_segment = json_segment_create_crypt(data_offset, 0, NULL, cipher, integrity, sector_size, 0);
if (!jobj_segment) {
r = -EINVAL;
goto err;
}
if (integrity) {
jobj_integrity = json_object_new_object();
if (!jobj_integrity) {
r = -ENOMEM;
goto err;
}
json_object_object_add(jobj_integrity, "type", json_object_new_string(integrity));
json_object_object_add(jobj_integrity, "journal_encryption", json_object_new_string("none"));
json_object_object_add(jobj_integrity, "journal_integrity", json_object_new_string("none"));
json_object_object_add(jobj_segment, "integrity", jobj_integrity);
}
if (json_object_object_add_by_uint(jobj_segments, 0, jobj_segment)) {
json_object_put(jobj_segment);
r = -ENOMEM;