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

Suppress useless slash escaping in json lib

Browse Source
This commit is contained in:
Ondrej Kozina
2018-04-20 13:12:33 +02:00
committed by Milan Broz
parent 5b6f06b2ac
commit a054206d25
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/luks2/luks2_json_metadata.c
View File

@@ -59,7 +59,8 @@ void JSON_DBG(json_object *jobj, const char *desc)
/* FIXME: make this conditional and disable for stable release. */
if (desc)
log_dbg("%s:", desc);
log_dbg("%s", json_object_to_json_string_ext(jobj, JSON_C_TO_STRING_PRETTY));
log_dbg("%s", json_object_to_json_string_ext(jobj,
JSON_C_TO_STRING_PRETTY | JSON_C_TO_STRING_NOSLASHESCAPE));
}
/*
@@ -445,11 +446,18 @@ int LUKS2_token_validate(json_object *hdr_jobj, json_object *jobj_token, const c
static int hdr_validate_json_size(json_object *hdr_jobj)
{
json_object *jobj, *jobj1;
const char *json;
size_t json_area_size, json_size;
json_object_object_get_ex(hdr_jobj, "config", &jobj);
json_object_object_get_ex(jobj, "json_size", &jobj1);
return (strlen(json_object_to_json_string_ext(hdr_jobj, JSON_C_TO_STRING_PLAIN)) > json_object_get_uint64(jobj1));
json = json_object_to_json_string_ext(hdr_jobj,
JSON_C_TO_STRING_PLAIN | JSON_C_TO_STRING_NOSLASHESCAPE);
json_area_size = (size_t)json_object_get_uint64(jobj1);
json_size = strlen(json);
return json_size > json_area_size ? 1 : 0;
}
int LUKS2_check_json_size(const struct luks2_hdr *hdr)