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

CHG: 'hf mf fchk' - textual

Browse source
This commit is contained in:
iceman1001 2019-01-02 12:11:49 +01:00
commit e3f4ef498f
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/cmdhfmf.c
View file

@ -1604,15 +1604,14 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
uint64_t t1 = msclock(); uint64_t t1 = msclock();
if ( use_flashmemory ) { 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 { } else {
// strategys. 1= deep first on sector 0 AB, 2= width first on all sectors // strategys. 1= deep first on sector 0 AB, 2= width first on all sectors
for (uint8_t strategy = 1; strategy < 3; strategy++) { for (uint8_t strategy = 1; strategy < 3; strategy++) {
PrintAndLogEx(SUCCESS, "Running strategy %u", strategy); PrintAndLogEx(SUCCESS, "Running strategy %u", strategy);
// main keychunk loop // main keychunk loop
for (uint32_t i = 0; i < keycnt; i += chunksize) { for (uint32_t i = 0; i < keycnt; i += chunksize) {

2
client/mifarehost.c
View file

@ -166,7 +166,7 @@ int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
// time to convert the returned data. // time to convert the returned data.
uint8_t curr_keys = resp.arg[0]; 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? // all keys?
if ( curr_keys == sectorsCnt*2 || lastChunk ) { if ( curr_keys == sectorsCnt*2 || lastChunk ) {

4
client/scripts/calypso.lua
View file

@ -68,9 +68,9 @@ end
--- ---
-- This is only meant to be used when errors occur -- This is only meant to be used when errors occur
local function oops(err) local function oops(err)
print("ERROR: ",err) print("ERROR: ", err)
calypso_switch_off_field() calypso_switch_off_field()
return nil,err return nil, err
end end
--- ---
-- Usage help -- Usage help