github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-12 08:16:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

speedup 'hf mf chk'

Browse source 
* fix abort by pressing the PM3 button
This commit is contained in:
pwpiwi 2020-01-09 07:43:11 +01:00
parent ac2668f898
commit d1009af506
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
armsrc/mifareutil.c
View file

@ -144,7 +144,7 @@ int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd,
// mifare classic commands
int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t *auth_timeout) {
return mifare_classic_authex(pcs, uid, blockNo, keyType, ui64Key, isNested, NULL, NULL, auth_timeout);
}
@ -858,12 +858,6 @@ int MifareChkBlockKeys(uint8_t *keys, uint8_t keyCount, uint8_t blockNo, uint8_t
uint8_t cascade_levels = 0;
uint64_t ui64Key = 0;
// Allow button press to interrupt device
if (BUTTON_PRESS()) {
Dbprintf("ChkKeys: Cancel operation. Exit...");
return -2;
}
int retryCount = 0;
for (uint8_t i = 0; i < keyCount; i++) {
@ -894,6 +888,10 @@ int MifareChkBlockKeys(uint8_t *keys, uint8_t keyCount, uint8_t blockNo, uint8_t
return i + 1;
}
if (BUTTON_PRESS()) {
return -2;
}
return 0;
}