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

Remove custom made 'contains' helper from keyslot validation.

Browse Source
This commit is contained in:
Ondrej Kozina
2018-04-19 11:04:22 +02:00
committed by Milan Broz
parent 790fdc0aa6
commit 22f10dd8d2
3 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/luks2/luks2_internal.h
View File

@@ -64,6 +64,10 @@ void JSON_DBG(json_object *jobj, const char *desc);
* LUKS2 JSON validation
*/
/* validation helper */
json_object *contains(json_object *jobj, const char *name, const char *section,
const char *key, json_type type);
int LUKS2_hdr_validate(json_object *hdr_jobj);
int LUKS2_keyslot_validate(json_object *hdr_jobj, json_object *hdr_keyslot, const char *key);
int LUKS2_check_json_size(const struct luks2_hdr *hdr);

2
lib/luks2/luks2_json_metadata.c
View File

@@ -251,7 +251,7 @@ static json_bool numbered(const char *name, const char *key)
return TRUE;
}
static json_object *contains(json_object *jobj, const char *name,
json_object *contains(json_object *jobj, const char *name,
const char *section, const char *key, json_type type)
{
json_object *sobj;

37
lib/luks2/luks2_keyslot_luks2.c
View File

@@ -641,17 +641,6 @@ static int luks2_keyslot_dump(struct crypt_device *cd, int keyslot)
return 0;
}
static int contains(json_object *jobj, const char *key, json_type type)
{
json_object *sobj;
if (!json_object_object_get_ex(jobj, key, &sobj) ||
!json_object_is_type(sobj, type))
return 0;
return 1;
}
static int luks2_keyslot_validate(struct crypt_device *cd, int keyslot)
{
struct luks2_hdr *hdr;
@@ -678,23 +667,23 @@ static int luks2_keyslot_validate(struct crypt_device *cd, int keyslot)
return -EINVAL;
if (!strcmp(json_object_get_string(jobj1), CRYPT_KDF_PBKDF2)) {
if (!contains(jobj_kdf, "hash", json_type_string) ||
!contains(jobj_kdf, "iterations", json_type_int) ||
!contains(jobj_kdf, "salt", json_type_string))
if (!contains(jobj_kdf, "kdf type", "pbkdf2", "hash", json_type_string) ||
!contains(jobj_kdf, "kdf type", "pbkdf2", "iterations", json_type_int) ||
!contains(jobj_kdf, "kdf type", "pbkdf2", "salt", json_type_string))
return -EINVAL;
} else {
if (!contains(jobj_kdf, "time", json_type_int) ||
!contains(jobj_kdf, "memory", json_type_int) ||
!contains(jobj_kdf, "cpus", json_type_int) ||
!contains(jobj_kdf, "salt", json_type_string))
if (!contains(jobj_kdf, "kdf type", "argon2", "time", json_type_int) ||
!contains(jobj_kdf, "kdf type", "argon2", "memory", json_type_int) ||
!contains(jobj_kdf, "kdf type", "argon2", "cpus", json_type_int) ||
!contains(jobj_kdf, "kdf type", "argon2", "salt", json_type_string))
return -EINVAL;
}
if (!json_object_object_get_ex(jobj_af, "type", &jobj1))
return -EINVAL;
if (!strcmp(json_object_get_string(jobj1), "luks1")) {
if (!contains(jobj_af, "hash", json_type_string) ||
!contains(jobj_af, "stripes", json_type_int))
if (!contains(jobj_af, "", "luks1 af", "hash", json_type_string) ||
!contains(jobj_af, "", "luks1 af", "stripes", json_type_int))
return -EINVAL;
} else
return -EINVAL;
@@ -703,10 +692,10 @@ static int luks2_keyslot_validate(struct crypt_device *cd, int keyslot)
if (!json_object_object_get_ex(jobj_area, "type", &jobj1))
return -EINVAL;
if (!strcmp(json_object_get_string(jobj1), "raw")) {
if (!contains(jobj_area, "encryption", json_type_string) ||
!contains(jobj_area, "key_size", json_type_int) ||
!contains(jobj_area, "offset", json_type_string) ||
!contains(jobj_area, "size", json_type_string))
if (!contains(jobj_area, "area", "raw type", "encryption", json_type_string) ||
!contains(jobj_area, "area", "raw type", "key_size", json_type_int) ||
!contains(jobj_area, "area", "raw type", "offset", json_type_string) ||
!contains(jobj_area, "area", "raw type", "size", json_type_string))
return -EINVAL;
} else
return -EINVAL;