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

14b, handle sof

Browse source
This commit is contained in:
iceman1001 2020-08-15 11:03:59 +02:00
commit 4965f40c24
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
client/src/cmdhf14b.c
View file

@ -147,15 +147,18 @@ static bool waitCmd14b(bool verbose) {
if (len >= 3) { if (len >= 3) {
bool crc = check_crc(CRC_14443_B, data, len); bool crc = check_crc(CRC_14443_B, data, len);
PrintAndLogEx(SUCCESS, "[LEN %u] %s[%02X %02X] %s", PrintAndLogEx(SUCCESS, "len %u | %s[%02X %02X] %s",
len, len,
sprint_hex(data, len - 2), sprint_hex(data, len - 2),
data[len - 2], data[len - 2],
data[len - 1], data[len - 1],
(crc) ? _GREEN_("OK") : _RED_("FAIL") (crc) ? _GREEN_("ok") : _RED_("fail")
); );
} else if (len == 0) {
PrintAndLogEx(SUCCESS, "received SOF only (maybe iCLASS/Picopass)");
} else { } else {
PrintAndLogEx(SUCCESS, "[LEN %u] %s", len, sprint_hex(data, len)); PrintAndLogEx(SUCCESS, "len %u | %s", len, sprint_hex(data, len));
} }
} }
return true; return true;
@ -168,7 +171,7 @@ static bool waitCmd14b(bool verbose) {
static int CmdHF14BList(const char *Cmd) { static int CmdHF14BList(const char *Cmd) {
(void)Cmd; // Cmd is not used so far (void)Cmd; // Cmd is not used so far
CmdTraceList("14b"); CmdTraceList("14b");
return 0; return PM3_SUCCESS;
} }
static int CmdHF14BSim(const char *Cmd) { static int CmdHF14BSim(const char *Cmd) {
@ -204,7 +207,7 @@ static int CmdHF14BCmdRaw(const char *Cmd) {
uint32_t flags = ISO14B_CONNECT; uint32_t flags = ISO14B_CONNECT;
uint32_t temp = 0, user_timeout = 0, time_wait = 0; uint32_t temp = 0, user_timeout = 0, time_wait = 0;
if (strlen(Cmd) < 3) return usage_hf_14b_raw(); if (strlen(Cmd) < 2) return usage_hf_14b_raw();
// strip // strip
while (*Cmd == ' ' || *Cmd == '\t') ++Cmd; while (*Cmd == ' ' || *Cmd == '\t') ++Cmd;