reworked the JSON format for 14a, 14b, 15, cryptorf, lto, NDEF.\nDeprecated EML format. Pm3 client do not save EML files any more.nPm3 client will continue to load EML files.
This commit is contained in:
1 parent
bb5d61dca7
commit
fb23d2047f
27 files changed
+617
-319
No files matched your search
+8
-12
@@ -1448,14 +1448,7 @@ static int CmdHFMFPDump(const char *Cmd) {
|
||||
free(fptr);
|
||||
}
|
||||
|
||||
saveFile(data_fn, ".bin", mem, MIFARE_4K_MAX_BYTES);
|
||||
saveFileEML(data_fn, mem, MIFARE_4K_MAX_BYTES, MFBLOCK_SIZE);
|
||||
|
||||
iso14a_mf_extdump_t xdump;
|
||||
xdump.card_info = card;
|
||||
xdump.dump = mem;
|
||||
xdump.dumplen = MIFARE_4K_MAX_BYTES;
|
||||
saveFileJSON(data_fn, jsfCardMemory, (uint8_t *)&xdump, sizeof(xdump), NULL);
|
||||
pm3_save_mf_dump(filename, dump, MIFARE_4K_MAX_BYTES, jsfCardMemory);
|
||||
*/
|
||||
free(mem);
|
||||
return PM3_SUCCESS;
|
||||
@@ -1746,16 +1739,19 @@ int CmdHFMFPNDEFRead(const char *Cmd) {
|
||||
print_buffer(data, datalen, 1);
|
||||
}
|
||||
|
||||
if (fnlen != 0) {
|
||||
saveFile(filename, ".bin", data, datalen);
|
||||
}
|
||||
|
||||
res = NDEFDecodeAndPrint(data, datalen, verbose);
|
||||
if (res != PM3_SUCCESS) {
|
||||
PrintAndLogEx(INFO, "Trying to parse NDEF records w/o NDEF header");
|
||||
res = NDEFRecordsDecodeAndPrint(data, datalen, verbose);
|
||||
}
|
||||
|
||||
// get total NDEF length before save. If fails, we save it all
|
||||
size_t n = 0;
|
||||
if (NDEFGetTotalLength(data, datalen, &n) != PM3_SUCCESS)
|
||||
n = datalen;
|
||||
|
||||
pm3_save_dump(filename, data, n, jsfNDEF);
|
||||
|
||||
if (verbose == false) {
|
||||
PrintAndLogEx(HINT, "Try " _YELLOW_("`hf mfp ndefread -v`") " for more details");
|
||||
} else {
|
||||
|
||||
Reference in new issue
Block a user