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

fix for client crash in lf hitag eload. Hitag simulation still now working (wip)

Browse source
This commit is contained in:
iceman1001 2021-06-20 23:02:18 +02:00
commit 0e7e13db7d
3 changed files with 31 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
armsrc/appmain.c
View file

@ -1114,15 +1114,9 @@ static void PacketReceived(PacketCommandNG *packet) {
break; break;
} }
case CMD_LF_HITAG_ELOAD: { case CMD_LF_HITAG_ELOAD: {
/* lf_hitag_t *payload = (lf_hitag_t *) packet->data.asBytes;
struct p {
uint16_t len;
uint8_t *data;
} PACKED;
struct p *payload = (struct p *) packet->data.asBytes;
uint8_t *mem = BigBuf_get_EM_addr(); uint8_t *mem = BigBuf_get_EM_addr();
memcpy((uint8_t *)mem.sectors, payload->data, payload->len); memcpy((uint8_t *)mem, payload->data, payload->len);
*/
break; break;
} }
#endif #endif

35
client/src/cmdlfhitag.c
View file

@ -210,14 +210,15 @@ static int CmdLFHitagEload(const char *Cmd) {
CLIParserContext *ctx; CLIParserContext *ctx;
CLIParserInit(&ctx, "lf hitag eload", CLIParserInit(&ctx, "lf hitag eload",
"Loads hitag tag dump into emulator memory on device", "Loads hitag tag dump into emulator memory on device",
"lf hitag eload -f lf-hitag-11223344-dump.bin\n"); "lf hitag eload -2 -f lf-hitag-11223344-dump.bin\n");
void *argtable[] = { void *argtable[] = {
arg_param_begin, arg_param_begin,
arg_str1("f", "file", "<filename>", "filename of dump"), arg_str1("f", "file", "<filename>", "filename of dump"),
arg_lit0("1", NULL, "simulate Hitag1"), arg_lit0("1", NULL, "Card type Hitag1"),
arg_lit0("2", NULL, "simulate Hitag2"), arg_lit0("2", NULL, "Card type Hitag2"),
arg_lit0("s", NULL, "simulate HitagS"), arg_lit0("s", NULL, "Card type HitagS"),
arg_lit0("m", NULL, "Card type HitagM"),
arg_param_end arg_param_end
}; };
CLIExecWithReturn(ctx, Cmd, argtable, false); CLIExecWithReturn(ctx, Cmd, argtable, false);
@ -229,9 +230,10 @@ static int CmdLFHitagEload(const char *Cmd) {
bool use_ht1 = arg_get_lit(ctx, 2); bool use_ht1 = arg_get_lit(ctx, 2);
bool use_ht2 = arg_get_lit(ctx, 3); bool use_ht2 = arg_get_lit(ctx, 3);
bool use_hts = arg_get_lit(ctx, 4); bool use_hts = arg_get_lit(ctx, 4);
bool use_htm = arg_get_lit(ctx, 5);
CLIParserFree(ctx); CLIParserFree(ctx);
uint8_t n = (use_ht1 + use_ht2 + use_hts); uint8_t n = (use_ht1 + use_ht2 + use_hts + use_htm);
if (n != 1) { if (n != 1) {
PrintAndLogEx(ERR, "error, only specify one Hitag type"); PrintAndLogEx(ERR, "error, only specify one Hitag type");
return PM3_EINVARG; return PM3_EINVARG;
@ -274,15 +276,24 @@ static int CmdLFHitagEload(const char *Cmd) {
// check dump len.. // check dump len..
if (dumplen == 48 || dumplen == 4 * 64) { if (dumplen == 48 || dumplen == 4 * 64) {
struct {
uint16_t len; lf_hitag_t *payload = calloc(1, sizeof(lf_hitag_t) + dumplen);
uint8_t *data;
} PACKED payload; if (use_ht1)
payload.len = dumplen; payload->type = 1;
memcpy(payload.data, dump, dumplen); if (use_ht2)
payload->type = 2;
if (use_hts)
payload->type = 3;
if (use_htm)
payload->type = 4;
payload->len = dumplen;
memcpy(payload->data, dump, dumplen);
clearCommandBuffer(); clearCommandBuffer();
SendCommandNG(CMD_LF_HITAG_ELOAD, (uint8_t *)&payload, 2 + dumplen); SendCommandNG(CMD_LF_HITAG_ELOAD, (uint8_t *)payload, 3 + dumplen);
free(payload);
} else { } else {
PrintAndLogEx(ERR, "error, wrong dump file size. got %zu", dumplen); PrintAndLogEx(ERR, "error, wrong dump file size. got %zu", dumplen);
} }

6
include/pm3_cmd.h
View file

@ -259,6 +259,12 @@ typedef struct {
uint8_t data[]; uint8_t data[];
} PACKED lf_nrzsim_t; } PACKED lf_nrzsim_t;
typedef struct {
uint8_t type;
uint16_t len;
uint8_t *data;
} PACKED lf_hitag_t;
typedef struct { typedef struct {
uint8_t blockno; uint8_t blockno;
uint8_t keytype; uint8_t keytype;