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

fix: adapting to run all strategies.

Browse source
This commit is contained in:
iceman1001 2017-12-18 12:14:02 +01:00
commit bc639bc3ec
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/cmdhfmf.c
View file

@ -1312,6 +1312,7 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
// 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++) {
PrintAndLog("[+] 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) {
@ -1332,8 +1333,8 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
if ( firstChunk ) if ( firstChunk )
firstChunk = false; firstChunk = false;
// all keys, aborted, last keychunk // all keys, aborted
if ( res == 0 || res == 2 || lastChunk ) if ( res == 0 || res == 2 )
goto out; goto out;
} // end chunks of keys } // end chunks of keys
} // end strategy } // end strategy

4
client/mifarehost.c
View file

@ -204,7 +204,11 @@ int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
} }
} }
free(tmp); free(tmp);
if ( curr_keys == sectorsCnt*2 )
return 0; return 0;
if ( lastChunk )
return 1;
} }
return 1; return 1;
} }