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

addded JSON import support for 4x50_restore

Browse source
This commit is contained in:
tharexde 2020-10-26 14:04:39 +01:00
commit bc87a6edf2
1 changed files with 11 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

41
client/src/cmdlfem4x50.c
View file

@ -151,12 +151,13 @@ static int usage_lf_em4x50_restore(void) {
PrintAndLogEx(NORMAL, "Options:"); PrintAndLogEx(NORMAL, "Options:");
PrintAndLogEx(NORMAL, " h - this help"); PrintAndLogEx(NORMAL, " h - this help");
PrintAndLogEx(NORMAL, " u <UID> - uid, try to restore from lf-4x50-<UID>-dump.bin"); PrintAndLogEx(NORMAL, " u <UID> - uid, try to restore from lf-4x50-<UID>-dump.bin");
PrintAndLogEx(NORMAL, " f <filename> - data filename <filename.bin/eml> (optional)"); PrintAndLogEx(NORMAL, " f <filename> - data filename <filename.bin/eml/json> (optional)");
PrintAndLogEx(NORMAL, " p <pwd> - password (hex, lsb) (optional)"); PrintAndLogEx(NORMAL, " p <pwd> - password (hex, lsb) (optional)");
PrintAndLogEx(NORMAL, "Examples:"); PrintAndLogEx(NORMAL, "Examples:");
PrintAndLogEx(NORMAL, _YELLOW_(" lf em 4x50_restore h")); PrintAndLogEx(NORMAL, _YELLOW_(" lf em 4x50_restore h"));
PrintAndLogEx(NORMAL, _YELLOW_(" lf em 4x50_restore f em4x50dump.bin")); PrintAndLogEx(NORMAL, _YELLOW_(" lf em 4x50_restore f em4x50dump.bin"));
PrintAndLogEx(NORMAL, _YELLOW_(" lf em 4x50_restore f em4x50dump.eml p 12345678")); PrintAndLogEx(NORMAL, _YELLOW_(" lf em 4x50_restore f em4x50dump.eml p 12345678"));
PrintAndLogEx(NORMAL, _YELLOW_(" lf em 4x50_restore f em4x50dump.json p 00000001"));
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -920,12 +921,11 @@ int CmdEM4x50Watch(const char *Cmd) {
int CmdEM4x50Restore(const char *Cmd) { int CmdEM4x50Restore(const char *Cmd) {
//uint8_t data[136] = {0x0};
size_t bytes_read = 0; size_t bytes_read = 0;
int res = 0;
char filename[FILE_PATH_SIZE] = {0}; char filename[FILE_PATH_SIZE] = {0};
char ext[FILE_PATH_SIZE] = {0}; char ext[FILE_PATH_SIZE] = {0};
char szTemp[FILE_PATH_SIZE - 20] = {0x00}; char szTemp[FILE_PATH_SIZE - 20] = {0x00};
FILE *fdump;
em4x50_data_t etd; em4x50_data_t etd;
etd.pwd_given = false; etd.pwd_given = false;
@ -970,36 +970,17 @@ int CmdEM4x50Restore(const char *Cmd) {
PrintAndLogEx(INFO, "Restoring " _YELLOW_("%s")" to card", filename); PrintAndLogEx(INFO, "Restoring " _YELLOW_("%s")" to card", filename);
// read data from dump file; file has to be "bin" or "eml" // read data from dump file; file type has to be "bin", "eml" or "json"
// (file type is distinguished by file extension)
memcpy(ext, &filename[strlen(filename) - 4], 4); memcpy(ext, &filename[strlen(filename) - 4], 4);
ext[5] = 0x00; ext[5] = 0x00;
if (memcmp(ext, ".eml", 4) == 0) { if (memcmp(ext, ".eml", 4) == 0)
res = loadFileEML(filename, etd.data, &bytes_read) != PM3_SUCCESS;
else if (memcmp(ext, ".json", 5) == 0)
res = loadFileJSON(filename, etd.data, sizeof(etd.data), &bytes_read, NULL);
else
res = loadFile(filename, ".bin", etd.data, sizeof(etd.data), &bytes_read);
// read from eml file if ((res != PM3_SUCCESS) && (bytes_read != DUMP_FILESIZE)) {
if (loadFileEML(filename, etd.data, &bytes_read) != PM3_SUCCESS)
return PM3_EFILE;
} else {
// open bin file
if ((fdump = fopen(filename, "rb")) == NULL) {
PrintAndLogEx(WARNING, "Could not find file " _YELLOW_("%s"), filename);
return PM3_EFILE;
}
// read from bin file
bytes_read = fread(&etd.data, sizeof(uint8_t), DUMP_FILESIZE, fdump);
PrintAndLogEx(SUCCESS, "Loaded " _YELLOW_("%i") " bytes from bin file " _YELLOW_("%s"),
bytes_read,
filename
);
fclose(fdump);
}
if (bytes_read != DUMP_FILESIZE) {
PrintAndLogEx(FAILED, "Read error"); PrintAndLogEx(FAILED, "Read error");
return PM3_EFILE; return PM3_EFILE;
} }