From d0169a303de017ff0c847a5f752a2449a76fdd17 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Thu, 6 Jan 2022 14:47:44 +0100 Subject: [PATCH 17/28] Split requirements validation from config section validation. --- lib/luks2/luks2_json_metadata.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/luks2/luks2_json_metadata.c b/lib/luks2/luks2_json_metadata.c index e45a9739..9109b07a 100644 --- a/lib/luks2/luks2_json_metadata.c +++ b/lib/luks2/luks2_json_metadata.c @@ -855,9 +855,10 @@ static int hdr_validate_digests(struct crypt_device *cd, json_object *hdr_jobj) return 0; } +/* requirements being validated in stand-alone routine */ static int hdr_validate_config(struct crypt_device *cd, json_object *hdr_jobj) { - json_object *jobj_config, *jobj, *jobj1; + json_object *jobj_config, *jobj; int i; uint64_t keyslots_size, metadata_size, segment_offset; @@ -912,6 +913,19 @@ static int hdr_validate_config(struct crypt_device *cd, json_object *hdr_jobj) return 1; } + return 0; +} + +static int hdr_validate_requirements(struct crypt_device *cd, json_object *hdr_jobj) +{ + int i; + json_object *jobj_config, *jobj, *jobj1; + + if (!json_object_object_get_ex(hdr_jobj, "config", &jobj_config)) { + log_dbg(cd, "Missing config section."); + return 1; + } + /* Requirements object is optional */ if (json_object_object_get_ex(jobj_config, "requirements", &jobj)) { if (!json_contains(cd, jobj_config, "section", "Config", "requirements", json_type_object)) @@ -937,6 +951,7 @@ int LUKS2_hdr_validate(struct crypt_device *cd, json_object *hdr_jobj, uint64_t struct { int (*validate)(struct crypt_device *, json_object *); } checks[] = { + { hdr_validate_requirements }, { hdr_validate_tokens }, { hdr_validate_digests }, { hdr_validate_segments }, -- 2.27.0