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

mfu read block: retry block with bad CRC

Browse source
This commit is contained in:
James Chambers 2018-03-15 13:45:21 -04:00
commit 4601d0e77a
1 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
armsrc/mifarecmd.c
View file

@ -310,6 +310,8 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
} }
} }
#define MFU_MAX_CRC_RETRIES 5
unsigned int retries = 0;
for (int i = 0; i < blocks; i++){ for (int i = 0; i < blocks; i++){
if ((i*4) + 4 >= CARD_MEMORY_SIZE) { if ((i*4) + 4 >= CARD_MEMORY_SIZE) {
Dbprintf("Data exceeds buffer!!"); Dbprintf("Data exceeds buffer!!");
@ -320,15 +322,22 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
if (len) { if (len) {
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block %d error",i); if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block %d error",i);
// if no blocks read - error out
if (i==0){ if (retries >= MFU_MAX_CRC_RETRIES) {
OnError(2); // if no blocks read - error out
return; if (i==0) {
OnError(2);
return;
} else {
//stop at last successful read block and return what we got
break;
}
} else { } else {
//stop at last successful read block and return what we got retries++;
break; i--;
} }
} else { } else {
retries = 0;
countblocks++; countblocks++;
} }
} }