RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-01-19 06:29:53 +08:00
Code Issues Projects Releases Packages Wiki Activity

hf legic dump - now use cliparser

Browse source
This commit is contained in:
tcprst 2020-12-21 12:41:14 -05:00
parent 85b1a833fc
commit 2f1408d659
No known key found for this signature in database
GPG key ID: 9145EAF5121AED25
3 changed files with 26 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/luascripts/hf_legic.lua
View file

@ -710,7 +710,7 @@ function readFromPM3()
local tag, bytes, infile local tag, bytes, infile
--infile="legic.temp" --infile="legic.temp"
infile=os.tmpname() infile=os.tmpname()
core.console("hf legic dump f "..infile) core.console("hf legic dump -f "..infile)
tag=readFile(infile..".bin") tag=readFile(infile..".bin")
os.remove(infile) os.remove(infile)
os.remove(infile..".bin") os.remove(infile..".bin")

75
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_dump(void) {
PrintAndLogEx(NORMAL, "Read all memory from LEGIC Prime MIM22, MIM256, MIM1024");
PrintAndLogEx(NORMAL, "and saves bin/eml/json dump file");
PrintAndLogEx(NORMAL, "It autodetects card type.\n");
PrintAndLogEx(NORMAL, "Usage: hf legic dump [h] [x] [f <filename w/o .bin>]\n");
PrintAndLogEx(NORMAL, "Options:");
PrintAndLogEx(NORMAL, " h : this help");
PrintAndLogEx(NORMAL, " f <filename> : filename w/o '.bin' to dump bytes");
PrintAndLogEx(NORMAL, " x : deobfuscate dump data (xor with MCC)");
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(NORMAL, "Examples:");
PrintAndLogEx(NORMAL, _YELLOW_(" hf legic dump - uses UID as filename"));
PrintAndLogEx(NORMAL, _YELLOW_(" hf legic dump f myfile"));
PrintAndLogEx(NORMAL, _YELLOW_(" hf legic dump x"));
return PM3_SUCCESS;
}
static int usage_legic_restore(void) { static int usage_legic_restore(void) {
PrintAndLogEx(NORMAL, "Reads binary file and it autodetects card type and verifies that the file has the same size"); PrintAndLogEx(NORMAL, "Reads binary file and it autodetects card type and verifies that the file has the same size");
PrintAndLogEx(NORMAL, "Then write the data back to card. All bytes except the first 7bytes [UID(4) MCC(1) DCF(2)]\n"); PrintAndLogEx(NORMAL, "Then write the data back to card. All bytes except the first 7bytes [UID(4) MCC(1) DCF(2)]\n");
@ -813,38 +797,29 @@ static int CmdLegicReader(const char *Cmd) {
} }
static int CmdLegicDump(const char *Cmd) { static int CmdLegicDump(const char *Cmd) {
CLIParserContext *ctx;
CLIParserInit(&ctx, "hf legic dump",
"Read all memory from LEGIC Prime MIM22, MIM256, MIM1024 and saves bin/eml/json dump file\n"
"It autodetects card type.",
"hf legic dump <-- use UID as filename\n"
"hf legic dump -f myfile <-- use user specified filename\n"
"hf legic dump --deobfuscate <-- use UID as filename and deobfuscate data");
int fileNameLen = 0; void *argtable[] = {
char filename[FILE_PATH_SIZE] = {0x00}; arg_param_begin,
char *fptr = filename; arg_str0("f", "file", "<filename>", "specify a filename for dump file"),
bool errors = false, shall_deobsfuscate = false; arg_lit0(NULL, "deobfuscate", "deobfuscate dump data (xor with MCC)"),
uint16_t dumplen; arg_param_end
uint8_t cmdp = 0; };
CLIExecWithReturn(ctx, Cmd, argtable, true);
while (param_getchar(Cmd, cmdp) != 0x00 && !errors) { int fnlen = 0;
switch (tolower(param_getchar(Cmd, cmdp))) { char filename[FILE_PATH_SIZE] = {0};
case 'h': CLIParamStrToBuf(arg_get_str(ctx, 1), (uint8_t *)filename, FILE_PATH_SIZE, &fnlen);
return usage_legic_dump();
case 'f': bool shall_deobsfuscate = arg_get_lit(ctx, 2);
fileNameLen = param_getstr(Cmd, cmdp + 1, filename, FILE_PATH_SIZE);
if (!fileNameLen) CLIParserFree(ctx);
errors = true;
if (fileNameLen > FILE_PATH_SIZE - 5)
fileNameLen = FILE_PATH_SIZE - 5;
cmdp += 2;
break;
case 'x':
shall_deobsfuscate = true;
cmdp++;
break;
default:
PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
errors = true;
break;
}
}
//Validations
if (errors) return usage_legic_dump();
// tagtype // tagtype
legic_card_select_t card; legic_card_select_t card;
@ -852,7 +827,7 @@ static int CmdLegicDump(const char *Cmd) {
PrintAndLogEx(WARNING, "Failed to identify tagtype"); PrintAndLogEx(WARNING, "Failed to identify tagtype");
return PM3_ESOFT; return PM3_ESOFT;
} }
dumplen = card.cardsize; uint16_t dumplen = card.cardsize;
legic_print_type(dumplen, 0); legic_print_type(dumplen, 0);
PrintAndLogEx(SUCCESS, "Reading tag memory %d b...", dumplen); PrintAndLogEx(SUCCESS, "Reading tag memory %d b...", dumplen);
@ -896,10 +871,10 @@ static int CmdLegicDump(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 dump
hf legic restore hf legic restore
hf legic eload hf legic eload
hf legic esave hf legic esave