This commit is contained in:
iceman1001 2023-06-26 15:01:08 +02:00
commit adfebd6510
3 changed files with 20 additions and 15 deletions

View file

@ -1835,20 +1835,20 @@ void SniffIso15693(uint8_t jam_search_len, uint8_t *jam_search_string, bool icla
switch_off(); switch_off();
DbpString(""); DbpString("");
DbpString(_CYAN_("Sniff statistics")); if (g_dbglevel > DBG_ERROR) {
DbpString("================================="); DbpString(_CYAN_("Sniff statistics"));
Dbprintf(" DecodeTag State........%d", dtag.state); DbpString("=================================");
Dbprintf(" DecodeTag byteCnt......%d", dtag.len); Dbprintf("DecodeTag State........ %d", dtag.state);
Dbprintf(" DecodeTag posCount.....%d", dtag.posCount); Dbprintf("DecodeTag byteCnt...... %d", dtag.len);
Dbprintf(" DecodeTagFSK State.....%d", dtagfsk.state); Dbprintf("DecodeTag posCount..... %d", dtag.posCount);
Dbprintf(" DecodeTagFSK byteCnt...%d", dtagfsk.len); Dbprintf("DecodeTagFSK State..... %d", dtagfsk.state);
Dbprintf(" DecodeTagFSK count.....%d", dtagfsk.count); Dbprintf("DecodeTagFSK byteCnt... %d", dtagfsk.len);
Dbprintf(" DecodeReader State.....%d", dreader.state); Dbprintf("DecodeTagFSK count..... %d", dtagfsk.count);
Dbprintf(" DecodeReader byteCnt...%d", dreader.byteCount); Dbprintf("DecodeReader State..... %d", dreader.state);
Dbprintf(" DecodeReader posCount..%d", dreader.posCount); Dbprintf("DecodeReader byteCnt... %d", dreader.byteCount);
Dbprintf(" Trace length..........." _YELLOW_("%d"), BigBuf_get_traceLen()); Dbprintf("DecodeReader posCount.. %d", dreader.posCount);
DbpString(""); }
Dbprintf("Trace length........... " _YELLOW_("%d"), BigBuf_get_traceLen());
} }
// Initialize Proxmark3 as ISO15693 reader // Initialize Proxmark3 as ISO15693 reader

View file

@ -683,8 +683,13 @@ static int CmdHFiClassSniff(const char *Cmd) {
WaitForResponse(CMD_HF_ICLASS_SNIFF, &resp); WaitForResponse(CMD_HF_ICLASS_SNIFF, &resp);
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(HINT, "Try `" _YELLOW_("hf iclass list") "` to view captured tracelog"); PrintAndLogEx(HINT, "Try `" _YELLOW_("hf iclass list") "` to view captured tracelog");
PrintAndLogEx(HINT, "Try `" _YELLOW_("trace save -f hf_iclass_mytrace") "` to save tracelog for later analysing"); PrintAndLogEx(HINT, "Try `" _YELLOW_("trace save -f hf_iclass_mytrace") "` to save tracelog for later analysing");
if (jam_epurse_update) {
PrintAndLogEx(HINT, "Verify if the jam worked by comparing value in trace and block 2");
}
PrintAndLogEx(NORMAL, "");
return PM3_SUCCESS; return PM3_SUCCESS;
} }

View file

@ -499,7 +499,7 @@ void annotateIclass(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, bool
uint8_t key[8]; uint8_t key[8];
if (check_known_default(csn, epurse, rmac, tmac, key)) { if (check_known_default(csn, epurse, rmac, tmac, key)) {
snprintf(exp, size, "CHECK ( %s )", sprint_hex_inrow(key, 8)); snprintf(exp, size, "CHECK ( " _GREEN_("%s") " )", sprint_hex_inrow(key, 8));
} else { } else {
snprintf(exp, size, "CHECK"); snprintf(exp, size, "CHECK");
} }