text

RfidResearchGroup · Jun 26, 2023 · adfebd6 · adfebd6
1 parent e83960a
commit adfebd6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
@@ -1835,20 +1835,20 @@ void SniffIso15693(uint8_t jam_search_len, uint8_t *jam_search_string, bool icla
     switch_off();
 
     DbpString("");
-    DbpString(_CYAN_("Sniff statistics"));
-    DbpString("=================================");
-    Dbprintf("  DecodeTag State........%d", dtag.state);
-    Dbprintf("  DecodeTag byteCnt......%d", dtag.len);
-    Dbprintf("  DecodeTag posCount.....%d", dtag.posCount);
-    Dbprintf("  DecodeTagFSK State.....%d", dtagfsk.state);
-    Dbprintf("  DecodeTagFSK byteCnt...%d", dtagfsk.len);
-    Dbprintf("  DecodeTagFSK count.....%d", dtagfsk.count);
-    Dbprintf("  DecodeReader State.....%d", dreader.state);
-    Dbprintf("  DecodeReader byteCnt...%d", dreader.byteCount);
-    Dbprintf("  DecodeReader posCount..%d", dreader.posCount);
-    Dbprintf("  Trace length..........." _YELLOW_("%d"), BigBuf_get_traceLen());
-    DbpString("");
-
+    if (g_dbglevel > DBG_ERROR) {
+        DbpString(_CYAN_("Sniff statistics"));
+        DbpString("=================================");
+        Dbprintf("DecodeTag State........ %d", dtag.state);
+        Dbprintf("DecodeTag byteCnt...... %d", dtag.len);
+        Dbprintf("DecodeTag posCount..... %d", dtag.posCount);
+        Dbprintf("DecodeTagFSK State..... %d", dtagfsk.state);
+        Dbprintf("DecodeTagFSK byteCnt... %d", dtagfsk.len);
+        Dbprintf("DecodeTagFSK count..... %d", dtagfsk.count);
+        Dbprintf("DecodeReader State..... %d", dreader.state);
+        Dbprintf("DecodeReader byteCnt... %d", dreader.byteCount);
+        Dbprintf("DecodeReader posCount.. %d", dreader.posCount);    
+    }
+    Dbprintf("Trace length........... " _YELLOW_("%d"), BigBuf_get_traceLen());
 }
 
 // Initialize Proxmark3 as ISO15693 reader

diff --git a/client/src/cmdhficlass.c b/client/src/cmdhficlass.c
@@ -683,8 +683,13 @@ static int CmdHFiClassSniff(const char *Cmd) {
 
     WaitForResponse(CMD_HF_ICLASS_SNIFF, &resp);
 
+    PrintAndLogEx(NORMAL, "");
     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");
+    if (jam_epurse_update) {
+        PrintAndLogEx(HINT, "Verify if the jam worked by comparing value in trace and block 2");
+    }
+    PrintAndLogEx(NORMAL, "");
     return PM3_SUCCESS;
 }
 

diff --git a/client/src/cmdhflist.c b/client/src/cmdhflist.c
@@ -499,7 +499,7 @@ void annotateIclass(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, bool
 
                 uint8_t key[8];
                 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 {
                     snprintf(exp, size, "CHECK");
                 }