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

hf 14b reader: show actual ASK CTx UID

Browse source
This commit is contained in:
Philippe Teuwen 2020-10-02 02:56:29 +02:00
commit 67c175fe7a
1 changed files with 53 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

70
client/src/cmdhf14b.c
View file

@ -811,15 +811,19 @@ static bool HF14B_Std_Reader(bool verbose) {
} }
static bool HF14B_ask_ct_Reader(bool verbose) { static bool HF14B_ask_ct_Reader(bool verbose) {
uint8_t cmd[] = {0x10}; uint8_t cmd1[] = {0x10};
uint8_t datalen = 1; uint8_t cmd2[] = {0x9F, 0xFF, 0xFF};
uint8_t cmd3[] = {0xC4};
uint8_t uid[4];
uint8_t pc, fc;
// 14b get and print UID only (general info) // 14b get and print UID only (general info)
uint32_t flags = ISO14B_CONNECT | ISO14B_RAW | ISO14B_APPEND_CRC; uint32_t flags = ISO14B_CONNECT | ISO14B_RAW | ISO14B_APPEND_CRC;
PacketResponseNG resp;
int status;
clearCommandBuffer(); clearCommandBuffer();
PacketResponseNG resp; SendCommandMIX(CMD_HF_ISO14443B_COMMAND, flags, sizeof(cmd1), 0, cmd1, sizeof(cmd1));
SendCommandMIX(CMD_HF_ISO14443B_COMMAND, flags, datalen, 0, cmd, sizeof(cmd));
if (!WaitForResponseTimeout(CMD_HF_ISO14443B_COMMAND, &resp, TIMEOUT)) { if (!WaitForResponseTimeout(CMD_HF_ISO14443B_COMMAND, &resp, TIMEOUT)) {
if (verbose) PrintAndLogEx(WARNING, "command execution timeout"); if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
@ -827,20 +831,52 @@ static bool HF14B_ask_ct_Reader(bool verbose) {
return false; return false;
} }
int status = resp.oldarg[0]; status = resp.oldarg[0];
PrintAndLogEx(DEBUG, "status %d", status); PrintAndLogEx(DEBUG, "status cmd1 %d", status);
bool retval = false; if (status == 4) {
if (status == 0) { pc = resp.data.asBytes[0];
PrintAndLogEx(SUCCESS, "\nASK CT - 14443-3b tag found:"); fc = resp.data.asBytes[1];
retval = true; } else {
} else if (status > 0) { switch_off_field_14b();
PrintAndLogEx(SUCCESS, "\nASK CT - 14443-3b tag found:"); return false;
PrintAndLogEx(SUCCESS, "%s", sprint_hex(resp.data.asBytes, status)); }
retval = true; clearCommandBuffer();
SendCommandMIX(CMD_HF_ISO14443B_COMMAND, flags, sizeof(cmd2), 0, cmd2, sizeof(cmd2));
if (!WaitForResponseTimeout(CMD_HF_ISO14443B_COMMAND, &resp, TIMEOUT)) {
if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
switch_off_field_14b();
return false;
}
status = resp.oldarg[0];
PrintAndLogEx(DEBUG, "status cmd2 %d", status);
if (status == 4) {
uid[0] = resp.data.asBytes[0];
uid[1] = resp.data.asBytes[1];
} else {
switch_off_field_14b();
return false;
}
clearCommandBuffer();
SendCommandMIX(CMD_HF_ISO14443B_COMMAND, flags, sizeof(cmd3), 0, cmd3, sizeof(cmd3));
if (!WaitForResponseTimeout(CMD_HF_ISO14443B_COMMAND, &resp, TIMEOUT)) {
if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
switch_off_field_14b();
return false;
}
status = resp.oldarg[0];
PrintAndLogEx(DEBUG, "status cmd3 %d", status);
if (status == 4) {
uid[2] = resp.data.asBytes[0];
uid[3] = resp.data.asBytes[1];
uint32_t uid32 = uid[0] + (uid[1] << 8) + (uid[2] << 16) + (uid[3] << 24);
PrintAndLogEx(SUCCESS, "\nASK CT - 14443-3b tag found:");
PrintAndLogEx(SUCCESS, "UID: %02X%02X%02X%02X (%u) Product code: %02X Fab code: %02X", uid[0], uid[1], uid[2], uid[3], uid32, pc, fc);
switch_off_field_14b();
return true;
} else {
switch_off_field_14b();
return false;
} }
switch_off_field_14b();
return retval;
} }
// test for other 14b type tags (mimic another reader - don't have tags to identify) // test for other 14b type tags (mimic another reader - don't have tags to identify)