From e3f4ef498fcf30d904f46e984cf4f2c077dd6cfe Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Wed, 2 Jan 2019 12:11:49 +0100 Subject: [PATCH] CHG: 'hf mf fchk' - textual --- client/cmdhfmf.c | 5 ++--- client/mifarehost.c | 2 +- client/scripts/calypso.lua | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c index 33e1c6f66..d92b2a1d4 100644 --- a/client/cmdhfmf.c +++ b/client/cmdhfmf.c @@ -1604,15 +1604,14 @@ int CmdHF14AMfChk_fast(const char *Cmd) { uint64_t t1 = msclock(); if ( use_flashmemory ) { - mfCheckKeys_fast( sectorsCnt, true, true, 1, 0, keyBlock, e_sector, use_flashmemory); + PrintAndLogEx(SUCCESS, "Using dictionary in flash memory"); + mfCheckKeys_fast( sectorsCnt, true, true, 1, 0, keyBlock, e_sector, use_flashmemory); } else { // strategys. 1= deep first on sector 0 AB, 2= width first on all sectors for (uint8_t strategy = 1; strategy < 3; strategy++) { PrintAndLogEx(SUCCESS, "Running strategy %u", strategy); - - // main keychunk loop for (uint32_t i = 0; i < keycnt; i += chunksize) { diff --git a/client/mifarehost.c b/client/mifarehost.c index 2859fc207..0f37f8a8b 100644 --- a/client/mifarehost.c +++ b/client/mifarehost.c @@ -166,7 +166,7 @@ int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk, // time to convert the returned data. uint8_t curr_keys = resp.arg[0]; - PrintAndLogEx(NORMAL, "\n[-] Chunk: %.1fs | found %u/%u keys (%u)", (float)(t2/1000.0), curr_keys, (sectorsCnt<<1), size); + PrintAndLogEx(SUCCESS, "\nChunk: %.1fs | found %u/%u keys (%u)", (float)(t2/1000.0), curr_keys, (sectorsCnt<<1), size); // all keys? if ( curr_keys == sectorsCnt*2 || lastChunk ) { diff --git a/client/scripts/calypso.lua b/client/scripts/calypso.lua index ad74c8183..ce90a25fd 100644 --- a/client/scripts/calypso.lua +++ b/client/scripts/calypso.lua @@ -68,9 +68,9 @@ end --- -- This is only meant to be used when errors occur local function oops(err) - print("ERROR: ",err) + print("ERROR: ", err) calypso_switch_off_field() - return nil,err + return nil, err end --- -- Usage help