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

hf legic rdbl - now use cliparser

Browse source
This commit is contained in:
tcprst 2020-12-20 20:52:49 -05:00
commit b407d921a9
No known key found for this signature in database
GPG key ID: 9145EAF5121AED25
2 changed files with 27 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

71
client/src/cmdhflegic.c
View file

@ -28,21 +28,6 @@ static int CmdHelp(const char *Cmd);
#define MAX_LENGTH 1024 #define MAX_LENGTH 1024
static int usage_legic_rdbl(void) {
PrintAndLogEx(NORMAL, "Read data from a LEGIC Prime tag\n");
PrintAndLogEx(NORMAL, "Usage: hf legic rdbl [h] [o <offset>] [l <length>] [iv <IV>]\n");
PrintAndLogEx(NORMAL, "Options:");
PrintAndLogEx(NORMAL, " h : this help");
PrintAndLogEx(NORMAL, " o <offset> : (hex) offset in data array to start download from");
PrintAndLogEx(NORMAL, " l <length> : (hex) number of bytes to read");
PrintAndLogEx(NORMAL, " i <IV> : (hex) (optional) Initialization vector to use. Must be odd and 7bits max");
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(NORMAL, "Examples:");
PrintAndLogEx(NORMAL, _YELLOW_(" hf legic rdbl o 0 l 16 - reads from byte[0] 0x16 bytes(system header)"));
PrintAndLogEx(NORMAL, _YELLOW_(" hf legic rdbl o 0 l 4 iv 55 - reads from byte[0] 0x4 bytes with IV 0x55"));
PrintAndLogEx(NORMAL, _YELLOW_(" hf legic rdbl o 0 l 100 iv 55 - reads 0x100 bytes with IV 0x55"));
return PM3_SUCCESS;
}
static int usage_legic_sim(void) { static int usage_legic_sim(void) {
PrintAndLogEx(NORMAL, "Simulates a LEGIC Prime tag. MIM22, MIM256, MIM1024 types can be emulated"); PrintAndLogEx(NORMAL, "Simulates a LEGIC Prime tag. MIM22, MIM256, MIM1024 types can be emulated");
PrintAndLogEx(NORMAL, "Use " _YELLOW_("`hf legic eload`") " to upload a dump into emulator memory\n"); PrintAndLogEx(NORMAL, "Use " _YELLOW_("`hf legic eload`") " to upload a dump into emulator memory\n");
@ -512,34 +497,32 @@ out:
// offset in data memory // offset in data memory
// number of bytes to read // number of bytes to read
static int CmdLegicRdbl(const char *Cmd) { static int CmdLegicRdbl(const char *Cmd) {
CLIParserContext *ctx;
CLIParserInit(&ctx, "hf legic rdbl",
"Read data from a LEGIC Prime tag",
"hf legic rdbl -o 0 -l 16 <- reads from byte[0] 16 bytes(system header)\n"
"hf legic rdbl -o 0 -l 4 --iv 55 <- reads from byte[0] 4 bytes with IV 0x55\n"
"hf legic rdbl -o 0 -l 256 --iv 55 <- reads from byte[0] 256 bytes with IV 0x55");
uint32_t offset = 0, len = 0, iv = 1; void *argtable[] = {
bool errors = false; arg_param_begin,
uint8_t cmdp = 0; arg_int1("o", "offset", "<dec>", "offset in data array to start download from"),
while (param_getchar(Cmd, cmdp) != 0x00 && !errors) { arg_int1("l", "length", "<dec>", "number of bytes to read"),
switch (tolower(param_getchar(Cmd, cmdp))) { arg_str0(NULL, "iv", "<hex>", "Initialization vector to use. Must be odd and 7bits max"),
case 'h' : arg_param_end
return usage_legic_rdbl(); };
case 'o' : CLIExecWithReturn(ctx, Cmd, argtable, false);
offset = param_get32ex(Cmd, cmdp + 1, 0, 16);
cmdp += 2; int offset = arg_get_int_def(ctx, 1, 0);
break;
case 'l' : int len = arg_get_int_def(ctx, 2, 0);
len = param_get32ex(Cmd, cmdp + 1, 0, 16);
cmdp += 2; int iv_len = 0;
break; uint8_t iv[1] = {0x01}; // formerly uidcrc
case 'i' :
iv = param_get32ex(Cmd, cmdp + 1, 1, 16); CLIGetHexWithReturn(ctx, 3, iv, &iv_len);
cmdp += 2;
break; CLIParserFree(ctx);
default :
PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
errors = true;
break;
}
}
//Validations
if (errors || strlen(Cmd) == 0) return usage_legic_rdbl();
// sanity checks // sanity checks
if (len + offset >= MAX_LENGTH) { if (len + offset >= MAX_LENGTH) {
@ -557,9 +540,9 @@ static int CmdLegicRdbl(const char *Cmd) {
} }
uint16_t datalen = 0; uint16_t datalen = 0;
int status = legic_read_mem(offset, len, iv, data, &datalen); int status = legic_read_mem(offset, len, iv[0], data, &datalen);
if (status == PM3_SUCCESS) { if (status == PM3_SUCCESS) {
PrintAndLogEx(NORMAL, "\n ## | 0 1 2 3 4 5 6 7 8 9 A B C D E F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F"); PrintAndLogEx(NORMAL, " ## | 0 1 2 3 4 5 6 7 8 9 A B C D E F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F");
PrintAndLogEx(NORMAL, "-----+------------------------------------------------------------------------------------------------"); PrintAndLogEx(NORMAL, "-----+------------------------------------------------------------------------------------------------");
print_hex_break(data, datalen, 32); print_hex_break(data, datalen, 32);
} }

1
doc/cliparser_todo.txt
View file

@ -82,7 +82,6 @@ hf legic reader
hf legic info hf legic info
hf legic dump hf legic dump
hf legic restore hf legic restore
hf legic rdbl
hf legic sim hf legic sim
hf legic wrbl hf legic wrbl
hf legic eload hf legic eload