mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-07-30 19:40:37 -07:00
added EM4x50 JSON export
This commit is contained in:
parent
3ce365ee2b
commit
9af388c1e1
3 changed files with 18 additions and 1 deletions
|
@ -683,9 +683,11 @@ int CmdEM4x50Dump(const char *Cmd) {
|
||||||
|
|
||||||
// saveFileEML will add .eml extension to filename
|
// saveFileEML will add .eml extension to filename
|
||||||
// saveFile (binary) passes in the .bin extension.
|
// saveFile (binary) passes in the .bin extension.
|
||||||
|
// saveFileJSON adds .json extension
|
||||||
saveFileEML(filename, data, sizeof(data), 4);
|
saveFileEML(filename, data, sizeof(data), 4);
|
||||||
saveFile(filename, ".bin", data, sizeof(data));
|
saveFile(filename, ".bin", data, sizeof(data));
|
||||||
//saveFileJSON...
|
saveFileJSON(filename, jsfEM4x50, data, sizeof(data), NULL);
|
||||||
|
|
||||||
return PM3_SUCCESS;
|
return PM3_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -521,6 +521,20 @@ int saveFileJSONex(const char *preferredName, JSONFileType ftype, uint8_t *data,
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case jsfEM4x50: {
|
||||||
|
JsonSaveStr(root, "FileType", "EM4X50");
|
||||||
|
JsonSaveBufAsHexCompact(root, "$.Card.Protection", data + (1 * 4), 4);
|
||||||
|
JsonSaveBufAsHexCompact(root, "$.Card.Config", data + (2 * 4), 4);
|
||||||
|
JsonSaveBufAsHexCompact(root, "$.Card.Serial", data + (32 * 4), 4);
|
||||||
|
JsonSaveBufAsHexCompact(root, "$.Card.UID", data + (33 * 4), 4);
|
||||||
|
|
||||||
|
for (size_t i = 0; i < (datalen / 4); i++) {
|
||||||
|
char path[PATH_MAX_LENGTH] = {0};
|
||||||
|
sprintf(path, "$.blocks.%zu", i);
|
||||||
|
JsonSaveBufAsHexCompact(root, path, data + (i * 4), 4);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
case jsfMfPlusKeys: {
|
case jsfMfPlusKeys: {
|
||||||
JsonSaveStr(root, "FileType", "mfp");
|
JsonSaveStr(root, "FileType", "mfp");
|
||||||
JsonSaveBufAsHexCompact(root, "$.Card.UID", &data[0], 7);
|
JsonSaveBufAsHexCompact(root, "$.Card.UID", &data[0], 7);
|
||||||
|
|
|
@ -66,6 +66,7 @@ typedef enum {
|
||||||
jsfMfDesfireKeys,
|
jsfMfDesfireKeys,
|
||||||
jsfEM4x05,
|
jsfEM4x05,
|
||||||
jsfEM4x69,
|
jsfEM4x69,
|
||||||
|
jsfEM4x50,
|
||||||
} JSONFileType;
|
} JSONFileType;
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue