github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

chg: 'hf 15 dump' - add basic json format when saving\nchg: 'hf 15 restore' - match file template to hf-(tyoe)-(uid)-dump.(extension)

Browse source
This commit is contained in:
iceman1001 2020-03-21 20:38:58 +01:00
commit dd3bd72af4
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/cmdhf15.c
View file

@ -399,7 +399,7 @@ static int usage_15_restore(void) {
{"-2", "use slower '1 out of 256' mode"}, {"-2", "use slower '1 out of 256' mode"},
{"-o", "set OPTION Flag (needed for TI)"}, {"-o", "set OPTION Flag (needed for TI)"},
{"r <NUM>", "numbers of retries on error, default is 3"}, {"r <NUM>", "numbers of retries on error, default is 3"},
{"u <UID>", "load hf-15-dump-<UID>.bin"}, {"u <UID>", "load hf-15-<UID>-dump.bin"},
{"f <filename>", "load <filename>"}, {"f <filename>", "load <filename>"},
{"b <block size>", "block size, default is 4"} {"b <block size>", "block size, default is 4"}
}; };
@ -1214,8 +1214,9 @@ static int CmdHF15Dump(const char *Cmd) {
PrintAndLogEx(NORMAL, "\n"); PrintAndLogEx(NORMAL, "\n");
size_t datalen = blocknum * 4; size_t datalen = blocknum * 4;
saveFile(filename, ".bin", data, datalen);
saveFileEML(filename, data, datalen, 4); saveFileEML(filename, data, datalen, 4);
saveFile(filename, ".bin", data, datalen); saveFileJSON(filename, jsf15, data, datalen);
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -1603,7 +1604,7 @@ static int CmdHF15Restore(const char *Cmd) {
case 'u': case 'u':
param_getstr(Cmd, cmdp + 1, buff, FILE_PATH_SIZE); param_getstr(Cmd, cmdp + 1, buff, FILE_PATH_SIZE);
cmdp++; cmdp++;
snprintf(filename, sizeof(filename), "hf-15-dump-%s-bin", buff); snprintf(filename, sizeof(filename), "hf-15-%s-dump.bin", buff);
break; break;
case 'h': case 'h':
return usage_15_restore(); return usage_15_restore();
@ -1622,6 +1623,7 @@ static int CmdHF15Restore(const char *Cmd) {
} }
if ((f = fopen(filename, "rb")) == NULL) { if ((f = fopen(filename, "rb")) == NULL) {
PrintAndLogEx(WARNING, "Could not find file %s", filename); PrintAndLogEx(WARNING, "Could not find file %s", filename);
return PM3_EFILE; return PM3_EFILE;
} }