trace extract: tell iCLASS SELECT and CHECK from other reader frames
They were matched on the low nibble of the first byte only. A 14a CL2 SELECT, 95 70 UID BCC CRC, is 9 bytes like a CHECK and was printed as its MACs, and a MIFARE AUTH B, 61 .., was taken as a SELECT and ate the frame after it. A SELECT now needs CSN[8] and a reply with a valid iCLASS CRC, which is only skipped when it matched. A CHECK carries no CRC, so a frame with a valid CRC_A is not one. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
e5ee5098c8
commit
587fd0b4ef
1 file changed
+10
-4
+10
-4
@@ -32,6 +32,7 @@
|
|||||||
#include "cmdlfhitagu.h" // annotate hitagu
|
#include "cmdlfhitagu.h" // annotate hitagu
|
||||||
#include "pm3_cmd.h" // tracelog_hdr_t
|
#include "pm3_cmd.h" // tracelog_hdr_t
|
||||||
#include "cliparser.h" // args..
|
#include "cliparser.h" // args..
|
||||||
|
#include "crc16.h" // check_crc
|
||||||
|
|
||||||
static int CmdHelp(const char *Cmd);
|
static int CmdHelp(const char *Cmd);
|
||||||
|
|
||||||
@@ -314,14 +315,19 @@ static uint16_t extractChallenges(uint16_t tracepos, uint16_t traceLen, uint8_t
|
|||||||
switch (c) {
|
switch (c) {
|
||||||
case ICLASS_CMD_SELECT: {
|
case ICLASS_CMD_SELECT: {
|
||||||
|
|
||||||
|
// SELECT CSN[8], answered by CSN[8] CRC[2]
|
||||||
|
if (data_len != 9) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
const tracelog_hdr_t *next_hdr = get_record(tracepos, traceLen, trace);
|
const tracelog_hdr_t *next_hdr = get_record(tracepos, traceLen, trace);
|
||||||
if (next_hdr == NULL) {
|
if (next_hdr == NULL) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
tracepos += SKIP_TO_NEXT(next_hdr);
|
if ((next_hdr->data_len != 10) || (check_crc(CRC_ICLASS, next_hdr->frame, 10) == false)) {
|
||||||
if (next_hdr->data_len != 10) {
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
tracepos += SKIP_TO_NEXT(next_hdr);
|
||||||
memcpy(extract_uid, next_hdr->frame, 8);
|
memcpy(extract_uid, next_hdr->frame, 8);
|
||||||
extract_uidlen = 8;
|
extract_uidlen = 8;
|
||||||
break;
|
break;
|
||||||
@@ -343,8 +349,8 @@ static uint16_t extractChallenges(uint16_t tracepos, uint16_t traceLen, uint8_t
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case ICLASS_CMD_CHECK: {
|
case ICLASS_CMD_CHECK: {
|
||||||
// get macs
|
// get macs, CHECK has no CRC unlike a 14a CL2 SELECT 95 70 UID BCC CRC
|
||||||
if (data_len == 9) {
|
if ((data_len == 9) && (check_crc(CRC_14443_A, frame, data_len) == false)) {
|
||||||
if (extract_uidlen == 8) {
|
if (extract_uidlen == 8) {
|
||||||
PrintAndLogEx(INFO, "hf iclass lookup --csn %s " NOLF, sprint_hex_inrow(extract_uid, extract_uidlen));
|
PrintAndLogEx(INFO, "hf iclass lookup --csn %s " NOLF, sprint_hex_inrow(extract_uid, extract_uidlen));
|
||||||
PrintAndLogEx(NORMAL, "--epurse %s " NOLF, sprint_hex_inrow(extract_epurse, 8));
|
PrintAndLogEx(NORMAL, "--epurse %s " NOLF, sprint_hex_inrow(extract_epurse, 8));
|
||||||
|
|||||||
Reference in new issue
Block a user