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

Fix the dump command hitag2

Browse source
This commit is contained in:
Nat McHugh 2022-11-27 14:55:12 +00:00
commit cfc72fb5f1
1 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

29
client/src/cmdlfhitag.c
View file

@ -844,15 +844,40 @@ static int CmdLFHitag2Dump(const char *Cmd) {
return PM3_EINVARG; return PM3_EINVARG;
} }
PrintAndLogEx(SUCCESS, "Dumping tag memory..."); hitag_function htf;
hitag_data htd;
memset(&htd, 0, sizeof(htd));
if (keylen == 6) {
htf = RHT2F_CRYPTO;
memcpy(htd.crypto.key, key, sizeof(htd.crypto.key));
PrintAndLogEx(INFO, "Authenticating in crypto mode");
} else {
htf = RHT2F_PASSWORD;
memcpy(htd.pwd.password, key, sizeof(htd.pwd.password));
PrintAndLogEx(INFO, "Authenticating in password mode");
}
uint16_t cmd = CMD_LF_HITAG_READER;
clearCommandBuffer(); clearCommandBuffer();
//SendCommandNG(CMD_LF_HITAG_DUMP, &htd, sizeof(htd)); SendCommandMIX(cmd, htf, 0, 0, &htd, sizeof(htd));
PacketResponseNG resp; PacketResponseNG resp;
if (WaitForResponseTimeout(CMD_ACK, &resp, 2000) == false) {
PrintAndLogEx(WARNING, "timeout while waiting for reply.");
return PM3_ETIMEOUT;
}
if (resp.oldarg[0] == false) {
PrintAndLogEx(DEBUG, "DEBUG: Error - hitag failed");
return PM3_ESOFT;
}
uint8_t *data = resp.data.asBytes; uint8_t *data = resp.data.asBytes;
if (data == NULL) if (data == NULL)
return PM3_ESOFT; return PM3_ESOFT;
PrintAndLogEx(SUCCESS, "Dumping tag memory...");
if (fnlen < 1) { if (fnlen < 1) {
char *fptr = filename; char *fptr = filename;
fptr += snprintf(filename, sizeof(filename), "lf-hitag-"); fptr += snprintf(filename, sizeof(filename), "lf-hitag-");