From b6a39768a18da9163187a231866129a4e36c3029 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Sat, 24 May 2025 21:30:23 +0200 Subject: [PATCH] text --- armsrc/appmain.c | 25 ++++++++++++++----------- armsrc/iso14443a.c | 14 +++++++------- client/src/cmdhficlass.c | 3 ++- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/armsrc/appmain.c b/armsrc/appmain.c index 30ac348a6..b159eaf8a 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -254,7 +254,7 @@ static uint32_t MeasureAntennaTuningLfData(void) { void print_stack_usage(void) { for (uint32_t *p = _stack_start; ; ++p) { if (*p != 0xdeadbeef) { - Dbprintf(" Max stack usage......... %d / %d bytes", (uint32_t)_stack_end - (uint32_t)p, (uint32_t)_stack_end - (uint32_t)_stack_start); + Dbprintf(" Max stack usage..... %d / %d bytes", (uint32_t)_stack_end - (uint32_t)p, (uint32_t)_stack_end - (uint32_t)_stack_start); break; } } @@ -365,7 +365,7 @@ static void print_debug_level(void) { sprintf(dbglvlstr, "extended"); break; } - Dbprintf(" Debug log level......... %d ( " _YELLOW_("%s")" )", g_dbglevel, dbglvlstr); + Dbprintf(" Debug log level..... %d ( " _YELLOW_("%s")" )", g_dbglevel, dbglvlstr); } // measure the Connection Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time. @@ -421,11 +421,11 @@ static void SendStatus(uint32_t wait) { print_debug_level(); tosend_t *ts = get_tosend(); - Dbprintf(" ToSendMax............... %d", ts->max); - Dbprintf(" ToSend BUFFERSIZE....... %d", TOSEND_BUFFER_SIZE); + Dbprintf(" ToSendMax........... %d", ts->max); + Dbprintf(" ToSend BUFFERSIZE... %d", TOSEND_BUFFER_SIZE); while ((AT91C_BASE_PMC->PMC_MCFR & AT91C_CKGR_MAINRDY) == 0); // Wait for MAINF value to become available... uint16_t mainf = AT91C_BASE_PMC->PMC_MCFR & AT91C_CKGR_MAINF; // Get # main clocks within 16 slow clocks - Dbprintf(" Slow clock.............. %d Hz", (16 * MAINCK) / mainf); + Dbprintf(" Slow clock.......... %d Hz", (16 * MAINCK) / mainf); uint32_t delta_time = 0; uint32_t start_time = GetTickCount(); #define SLCK_CHECK_MS 50 @@ -449,10 +449,11 @@ static void SendStatus(uint32_t wait) { } else { num = 0; } + if (num > 0) { - Dbprintf(" Mifare.................. "_YELLOW_("%u")" keys (spiffs: "_GREEN_("%s")")", num, MF_KEYS_FILE); + Dbprintf(" Mifare... "_YELLOW_("%u")" keys - "_GREEN_("%s"), num, MF_KEYS_FILE); } else { - Dbprintf(" Mifare.................. "_RED_("%u")" keys (spiffs: "_RED_("%s")")", num, MF_KEYS_FILE); + Dbprintf(" Mifare... "_RED_("%u")" keys - "_RED_("%s"), num, MF_KEYS_FILE); } if (exists_in_spiffs(T55XX_KEYS_FILE)) { @@ -460,10 +461,11 @@ static void SendStatus(uint32_t wait) { } else { num = 0; } + if (num > 0) { - Dbprintf(" T55xx................... "_YELLOW_("%u")" keys (spiffs: "_GREEN_("%s")")", num, T55XX_KEYS_FILE); + Dbprintf(" T55xx.... "_YELLOW_("%u")" keys - "_GREEN_("%s"), num, T55XX_KEYS_FILE); } else { - Dbprintf(" T55xx................... "_RED_("%u")" keys (spiffs: "_RED_("%s")")", num, T55XX_KEYS_FILE); + Dbprintf(" T55xx.... "_RED_("%u")" keys - "_RED_("%s"), num, T55XX_KEYS_FILE); } if (exists_in_spiffs(ICLASS_KEYS_FILE)) { @@ -471,10 +473,11 @@ static void SendStatus(uint32_t wait) { } else { num = 0; } + if (num > 0) { - Dbprintf(" iClass.................. "_YELLOW_("%u")" keys (spiffs: "_GREEN_("%s")")", num, ICLASS_KEYS_FILE); + Dbprintf(" iClass... "_YELLOW_("%u")" keys - "_GREEN_("%s"), num, ICLASS_KEYS_FILE); } else { - Dbprintf(" iClass.................. "_RED_("%u")" keys (spiffs: "_RED_("%s")")", num, ICLASS_KEYS_FILE); + Dbprintf(" iClass... "_RED_("%u")" keys - "_RED_("%s"), num, ICLASS_KEYS_FILE); } #endif DbpString(""); diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c index 8bca5d2de..f77dcdeb3 100644 --- a/armsrc/iso14443a.c +++ b/armsrc/iso14443a.c @@ -190,35 +190,35 @@ struct Crypto1State crypto1_state = {0, 0}; void printHf14aConfig(void) { DbpString(_CYAN_("HF 14a config")); - Dbprintf(" [a] Anticol override.............. %s%s%s", + Dbprintf(" [a] Anticol override........... %s%s%s", (hf14aconfig.forceanticol == 0) ? _GREEN_("std") " ( follow standard )" : "", (hf14aconfig.forceanticol == 1) ? _RED_("force") " ( always do anticol )" : "", (hf14aconfig.forceanticol == 2) ? _RED_("skip") " ( always skip anticol )" : "" ); - Dbprintf(" [b] BCC override.................. %s%s%s", + Dbprintf(" [b] BCC override............... %s%s%s", (hf14aconfig.forcebcc == 0) ? _GREEN_("std") " ( follow standard )" : "", (hf14aconfig.forcebcc == 1) ? _RED_("fix") " ( fix bad BCC )" : "", (hf14aconfig.forcebcc == 2) ? _RED_("ignore") " ( ignore bad BCC, always use card BCC )" : "" ); - Dbprintf(" [2] CL2 override.................. %s%s%s", + Dbprintf(" [2] CL2 override............... %s%s%s", (hf14aconfig.forcecl2 == 0) ? _GREEN_("std") " ( follow standard )" : "", (hf14aconfig.forcecl2 == 1) ? _RED_("force") " ( always do CL2 )" : "", (hf14aconfig.forcecl2 == 2) ? _RED_("skip") " ( always skip CL2 )" : "" ); - Dbprintf(" [3] CL3 override.................. %s%s%s", + Dbprintf(" [3] CL3 override............... %s%s%s", (hf14aconfig.forcecl3 == 0) ? _GREEN_("std") " ( follow standard )" : "", (hf14aconfig.forcecl3 == 1) ? _RED_("force") " ( always do CL3 )" : "", (hf14aconfig.forcecl3 == 2) ? _RED_("skip") " ( always skip CL3 )" : "" ); - Dbprintf(" [r] RATS override................. %s%s%s", + Dbprintf(" [r] RATS override.............. %s%s%s", (hf14aconfig.forcerats == 0) ? _GREEN_("std") " ( follow standard )" : "", (hf14aconfig.forcerats == 1) ? _RED_("force") " ( always do RATS )" : "", (hf14aconfig.forcerats == 2) ? _RED_("skip") " ( always skip RATS )" : "" ); - Dbprintf(" [m] Magsafe polling............... %s", + Dbprintf(" [m] Magsafe polling............ %s", (hf14aconfig.magsafe == 1) ? _GREEN_("enabled") : _YELLOW_("disabled") ); - Dbprintf(" [p] Polling loop annotation....... %s %*D", + Dbprintf(" [p] Polling loop annotation.... %s %*D", (hf14aconfig.polling_loop_annotation.frame_length <= 0) ? _YELLOW_("disabled") : _GREEN_("enabled"), hf14aconfig.polling_loop_annotation.frame_length, hf14aconfig.polling_loop_annotation.frame, diff --git a/client/src/cmdhficlass.c b/client/src/cmdhficlass.c index b7b9904b0..d91b7b931 100644 --- a/client/src/cmdhficlass.c +++ b/client/src/cmdhficlass.c @@ -3040,7 +3040,7 @@ static int CmdHFiClass_TearBlock(const char *Cmd) { auth = true; memcpy(key, iClass_Key_Table[key_nr], 8); PrintAndLogEx(NORMAL, ""); - PrintAndLogEx(SUCCESS, "Using key[%d] " _GREEN_("%s"), key_nr, sprint_hex(iClass_Key_Table[key_nr], 8)); + PrintAndLogEx(SUCCESS, "Using key[%d] " _GREEN_("%s"), key_nr, sprint_hex_inrow(iClass_Key_Table[key_nr], 8)); } else { PrintAndLogEx(ERR, "Key number is invalid"); return PM3_EINVARG; @@ -3156,6 +3156,7 @@ static int CmdHFiClass_TearBlock(const char *Cmd) { first_read = true; reread = false; } + PrintAndLogEx(SUCCESS, "Original block data... " _CYAN_("%s"), sprint_hex_inrow(data_read_orig, sizeof(data_read_orig))); PrintAndLogEx(SUCCESS, "New data to write..... " _YELLOW_("%s"), sprint_hex_inrow(data, sizeof(data))); PrintAndLogEx(INFO, "------------------------------------------");