github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-14 02:27:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

added a load json root fct

Browse source
This commit is contained in:
iceman1001 2021-05-08 10:47:59 +02:00
commit 52494a6456
2 changed files with 41 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

40
client/src/fileutils.c
View file

@ -1224,6 +1224,46 @@ out:
return retval; return retval;
} }
int loadFileJSONroot(const char *preferredName, void *out_root, bool verbose) {
if (out_root == NULL) {
return PM3_EINVARG;
}
char *path;
int res = searchFile(&path, RESOURCES_SUBDIR, preferredName, ".json", false);
if (res != PM3_SUCCESS) {
return PM3_EFILE;
}
json_error_t error;
json_t *root = json_load_file(path, 0, &error);
if (verbose)
PrintAndLogEx(SUCCESS, "loaded from JSON file " _YELLOW_("%s"), path);
free(path);
int retval = PM3_SUCCESS;
if (root == NULL) {
PrintAndLogEx(ERR, "ERROR: json " _YELLOW_("%s") " error on line %d: %s", preferredName, error.line, error.text);
retval = PM3_ESOFT;
goto out;
}
if (!json_is_object(root)) {
PrintAndLogEx(ERR, "ERROR: Invalid json " _YELLOW_("%s") " format. root must be an object.", preferredName);
retval = PM3_ESOFT;
goto out;
}
out_root = root;
return PM3_SUCCESS;
out:
json_decref(root);
return retval;
}
int loadFileDICTIONARY(const char *preferredName, void *data, size_t *datalen, uint8_t keylen, uint32_t *keycnt) { int loadFileDICTIONARY(const char *preferredName, void *data, size_t *datalen, uint8_t keylen, uint32_t *keycnt) {
// t5577 == 4bytes // t5577 == 4bytes
// mifare == 6 bytes // mifare == 6 bytes

2
client/src/fileutils.h
View file

@ -206,7 +206,7 @@ int loadFileEML_safe(const char *preferredName, void **pdata, size_t *datalen);
*/ */
int loadFileJSON(const char *preferredName, void *data, size_t maxdatalen, size_t *datalen, void (*callback)(json_t *)); int loadFileJSON(const char *preferredName, void *data, size_t maxdatalen, size_t *datalen, void (*callback)(json_t *));
int loadFileJSONex(const char *preferredName, void *data, size_t maxdatalen, size_t *datalen, bool verbose, void (*callback)(json_t *)); int loadFileJSONex(const char *preferredName, void *data, size_t maxdatalen, size_t *datalen, bool verbose, void (*callback)(json_t *));
int loadFileJSONroot(const char *preferredName, void *out_root, bool verbose);
/** /**
* @brief Utility function to load data from a DICTIONARY textfile. This method takes a preferred name. * @brief Utility function to load data from a DICTIONARY textfile. This method takes a preferred name.