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

hf legic esave - now use cliparser

Browse source
This commit is contained in:
tcprst 2020-12-21 15:00:02 -05:00
commit f1c4be446c
No known key found for this signature in database
GPG key ID: 9145EAF5121AED25
2 changed files with 42 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

101
client/src/cmdhflegic.c
View file

@ -28,22 +28,6 @@ static int CmdHelp(const char *Cmd);
#define MAX_LENGTH 1024 #define MAX_LENGTH 1024
static int usage_legic_esave(void) {
PrintAndLogEx(NORMAL, "It saves bin/eml/json dump file of emulator memory\n");
PrintAndLogEx(NORMAL, "Usage: hf legic esave [h] [card memory] f <file name w/o `.bin`>\n");
PrintAndLogEx(NORMAL, "Options:");
PrintAndLogEx(NORMAL, " h : this help");
PrintAndLogEx(NORMAL, " [card memory] : 0 = MIM22");
PrintAndLogEx(NORMAL, " : 1 = MIM256 (default)");
PrintAndLogEx(NORMAL, " : 2 = MIM1024");
PrintAndLogEx(NORMAL, " f <filename> : filename w/o .bin to load");
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(NORMAL, "Examples:");
PrintAndLogEx(NORMAL, _YELLOW_(" hf legic esave 2 - uses UID as filename"));
PrintAndLogEx(NORMAL, _YELLOW_(" hf legic esave 2 f myfile"));
return PM3_SUCCESS;
}
static bool legic_xor(uint8_t *data, uint16_t cardsize) { static bool legic_xor(uint8_t *data, uint16_t cardsize) {
if (cardsize <= 22) { if (cardsize <= 22) {
@ -1032,49 +1016,48 @@ static int CmdLegicELoad(const char *Cmd) {
} }
static int CmdLegicESave(const char *Cmd) { static int CmdLegicESave(const char *Cmd) {
CLIParserContext *ctx;
CLIParserInit(&ctx, "hf legic esave",
"Saves bin/eml/json dump file of emulator memory",
"hf legic esave <- uses UID as filename\n"
"hf legic esave -f myfile -t 0 <- Type MIM22\n"
"hf legic esave -f myfile -t 1 <- Type MIM256 (default)\n"
"hf legic esave -f myfile -t 2 <- Type MIM1024");
void *argtable[] = {
arg_param_begin,
arg_str0("f", "file", "<filename>", "Specify a filename to save"),
arg_int0("t", "type", "<dec>", "Tag type"),
arg_lit0(NULL, "deobfuscate", "De-obfuscate dump data (xor with MCC)"),
arg_param_end
};
CLIExecWithReturn(ctx, Cmd, argtable, true);
int fnlen = 0;
char filename[FILE_PATH_SIZE] = {0}; char filename[FILE_PATH_SIZE] = {0};
char *fptr = filename; CLIParamStrToBuf(arg_get_str(ctx, 1), (uint8_t *)filename, FILE_PATH_SIZE, &fnlen);
int fileNameLen = 0;
size_t numofbytes = 256; size_t numofbytes = 0;
bool errors = false, shall_deobsfuscate = false;
uint8_t cmdp = 0; switch (arg_get_int_def(ctx, 2, 1)) {
while (param_getchar(Cmd, cmdp) != 0x00 && !errors) { case 0:
switch (tolower(param_getchar(Cmd, cmdp))) { numofbytes = 22;
case 'h' : break;
return usage_legic_esave(); case 1:
case 'f' : numofbytes = 256;
fileNameLen = param_getstr(Cmd, cmdp + 1, filename, FILE_PATH_SIZE); break;
if (!fileNameLen) case 2:
errors = true; numofbytes = 1024;
if (fileNameLen > FILE_PATH_SIZE - 5) break;
fileNameLen = FILE_PATH_SIZE - 5; default:
cmdp += 2; PrintAndLogEx(ERR, "Unknown tag type");
break; CLIParserFree(ctx);
case 'x': return PM3_EINVARG;
shall_deobsfuscate = true;
cmdp++;
break;
case '0' :
numofbytes = 22;
cmdp++;
break;
case '1' :
numofbytes = 256;
cmdp++;
break;
case '2' :
numofbytes = 1024;
cmdp++;
break;
default :
PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
errors = true;
break;
}
} }
//Validations
if (errors || strlen(Cmd) == 0) return usage_legic_esave(); bool shall_deobsfuscate = arg_get_lit(ctx, 3);
CLIParserFree(ctx);
// set up buffer // set up buffer
uint8_t *data = calloc(numofbytes, sizeof(uint8_t)); uint8_t *data = calloc(numofbytes, sizeof(uint8_t));
@ -1092,10 +1075,10 @@ static int CmdLegicESave(const char *Cmd) {
} }
// user supplied filename? // user supplied filename?
if (fileNameLen < 1) { if (fnlen < 1) {
PrintAndLogEx(INFO, "Using UID as filename"); PrintAndLogEx(INFO, "Using UID as filename");
fptr += snprintf(fptr, sizeof(filename), "hf-legic-"); strcat(filename, "hf-legic-");
FillFileNameByUID(fptr, data, "-dump", 4); FillFileNameByUID(filename, data, "-dump", 4);
} }
if (shall_deobsfuscate) { if (shall_deobsfuscate) {

1
doc/cliparser_todo.txt
View file

@ -74,7 +74,6 @@ hf felica resetmode
hf felica litesim hf felica litesim
hf felica litedump hf felica litedump
hf fido info hf fido info
hf legic esave
hf mf darkside hf mf darkside
hf mf nested hf mf nested
hf mf hardnested hf mf hardnested