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

minor hitag adaptations

Browse source
This commit is contained in:
iceman1001 2022-07-30 20:11:39 +02:00
commit 2cfc4dc733
1 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

40
client/src/cmdlfhitag.c
View file

@ -627,6 +627,9 @@ static int CmdLFHitagReader(const char *Cmd) {
// block3, 1 byte // block3, 1 byte
printHitag2Configuration(data[4 * 3]); printHitag2Configuration(data[4 * 3]);
// print data
print_hex_break(data, 48, 4);
} }
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -820,17 +823,14 @@ static int CmdLFHitag2Dump(const char *Cmd) {
arg_param_end arg_param_end
}; };
CLIExecWithReturn(ctx, Cmd, argtable, false); CLIExecWithReturn(ctx, Cmd, argtable, false);
uint8_t filename[FILE_PATH_SIZE] = {0};
int fnlen = 0; int fnlen = 0;
int res = CLIParamHexToBuf(arg_get_str(ctx, 1), filename, sizeof(filename), &fnlen); char filename[FILE_PATH_SIZE] = {0};
if (res != 0) { CLIParamStrToBuf(arg_get_str(ctx, 1), (uint8_t *)filename, FILE_PATH_SIZE, &fnlen);
CLIParserFree(ctx);
return PM3_EINVARG;
}
uint8_t key[6]; uint8_t key[6];
int keylen = 0; int keylen = 0;
res = CLIParamHexToBuf(arg_get_str(ctx, 2), key, sizeof(key), &keylen); int res = CLIParamHexToBuf(arg_get_str(ctx, 2), key, sizeof(key), &keylen);
if (res != 0) { if (res != 0) {
CLIParserFree(ctx); CLIParserFree(ctx);
return PM3_EINVARG; return PM3_EINVARG;
@ -844,22 +844,22 @@ static int CmdLFHitag2Dump(const char *Cmd) {
return PM3_EINVARG; return PM3_EINVARG;
} }
PrintAndLogEx(WARNING, "to be implemented..."); PrintAndLogEx(SUCCESS, "Dumping tag memory...");
/* clearCommandBuffer();
PrintAndLogEx(SUCCESS, "Dumping tag memory..."); //SendCommandNG(CMD_LF_HITAG_DUMP, &htd, sizeof(htd));
PacketResponseNG resp;
uint8_t *data = resp.data.asBytes;
clearCommandBuffer(); if (fnlen < 1) {
//SendCommandNG(CMD_LF_HITAG_DUMP, &htd, sizeof(htd)); char *fptr = filename;
PacketResponseNG resp; fptr += snprintf(filename, sizeof(filename), "lf-hitag-");
uint8_t *data = resp.data.asBytes; FillFileNameByUID(fptr, data, "-dump", 4);
if (fnlen < 1) { }
char *fptr = filename + snprintf(filename, sizeof(filename), "lf-hitag-");
FillFileNameByUID(fptr, data, "-dump", 4);
}
pm3_save_dump(filename, data, 48, jsfHitag, 4); print_hex_break(data, 48, 4);
*/
pm3_save_dump(filename, data, 48, jsfHitag, 4);
return PM3_SUCCESS; return PM3_SUCCESS;
} }