github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-07-16 10:03:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

change 'hf 15 restore' now supports EML/JSON

Browse source
This commit is contained in:
iceman1001 2021-04-15 18:27:24 +02:00
parent 097d24347f
commit 46bf529763
3 changed files with 37 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

34
client/src/cmdhf15.c
View file

@ -1982,10 +1982,38 @@ static int CmdHF15Restore(const char *Cmd) {
}
PrintAndLogEx(INFO, "Using block size... %zu", blocksize);
// 4bytes * 256 blocks. Should be enough..
uint8_t *data = calloc(4 * 256, sizeof(uint8_t));
if (data == NULL) {
PrintAndLogEx(WARNING, "Fail, cannot allocate memory");
return PM3_EMALLOC;
}
size_t datalen = 0;
uint8_t *data = NULL;
if (loadFile_safe(filename, ".bin", (void **)&data, &datalen) != PM3_SUCCESS) {
PrintAndLogEx(WARNING, "could not find file " _YELLOW_("%s"), filename);
int res = PM3_SUCCESS;
DumpFileType_t dftype = getfiletype(filename);
switch (dftype) {
case BIN: {
res = loadFile_safe(filename, ".bin", (void **)&data, &datalen);
break;
}
case EML: {
res = loadFileEML_safe(filename, (void **)&data, &datalen);
break;
}
case JSON: {
res = loadFileJSON(filename, data, 256 * 4, &datalen, NULL);
break;
}
case DICTIONARY: {
PrintAndLogEx(ERR, "Error: Only BIN/JSON/EML formats allowed");
free(data);
return PM3_EINVARG;
}
}
if (res != PM3_SUCCESS) {
free(data);
return PM3_EFILE;
}