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

more cleanup

Browse source
This commit is contained in:
LW 2019-12-18 19:21:00 -08:00
parent a906a0f457
commit 4792fbdf9b
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
client/mifare/mifarehost.c
View file

@ -457,7 +457,12 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,
uint32_t max_keys = (statelists[0].len > (USB_CMD_DATA_SIZE / 6)) ? (USB_CMD_DATA_SIZE / 6) : statelists[0].len; uint32_t max_keys = (statelists[0].len > (USB_CMD_DATA_SIZE / 6)) ? (USB_CMD_DATA_SIZE / 6) : statelists[0].len;
keyBlock = calloc(max_keys, 6); keyBlock = calloc(max_keys, 6);
if (keyBlock == NULL) return -5;
if (keyBlock == NULL) {
free(statelists[0].head.slhead);
free(statelists[1].head.slhead);
return -4;
}
memset(resultKey, 0, 6); memset(resultKey, 0, 6);
// The list may still contain several key candidates. Test each of them with mfCheckKeys // The list may still contain several key candidates. Test each of them with mfCheckKeys
@ -487,8 +492,8 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,
} }
} }
if (!isOK) if (!isOK && statelists[0].len != 1)
PrintAndLog("Key found after checking %d key(s)\n", i+max_keys); PrintAndLog("Key found after checking %d keys\n", i+max_keys);
free(statelists[0].head.slhead); free(statelists[0].head.slhead);
free(statelists[1].head.slhead); free(statelists[1].head.slhead);