crewID/libnfc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix accidental overwrite of Mifare special trailer block in unlocked read

Browse source
This commit is contained in:
Adam Laurie 2011-09-07 09:41:04 +00:00
parent 028f310576
commit 24881bd32d
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
examples/nfc-mfclassic.c
View file

@ -296,10 +296,14 @@ read_card (int read_unlocked)
} }
// Try to read out the trailer // Try to read out the trailer
if (nfc_initiator_mifare_cmd (pnd, MC_READ, iBlock, &mp)) { if (nfc_initiator_mifare_cmd (pnd, MC_READ, iBlock, &mp)) {
// Copy the keys over from our key dump and store the retrieved access bits if(read_unlocked) {
memcpy (mtDump.amb[iBlock].mbt.abtKeyA, mtKeys.amb[iBlock].mbt.abtKeyA, 6); memcpy (mtDump.amb[iBlock].mbd.abtData, mp.mpd.abtData, 16);
memcpy (mtDump.amb[iBlock].mbt.abtAccessBits, mp.mpd.abtData + 6, 4); } else {
memcpy (mtDump.amb[iBlock].mbt.abtKeyB, mtKeys.amb[iBlock].mbt.abtKeyB, 6); // Copy the keys over from our key dump and store the retrieved access bits
memcpy (mtDump.amb[iBlock].mbt.abtKeyA, mtKeys.amb[iBlock].mbt.abtKeyA, 6);
memcpy (mtDump.amb[iBlock].mbt.abtAccessBits, mp.mpd.abtData + 6, 4);
memcpy (mtDump.amb[iBlock].mbt.abtKeyB, mtKeys.amb[iBlock].mbt.abtKeyB, 6);
}
} else { } else {
printf ("!\nError: unable to read trailer block 0x%02x\n", iBlock); printf ("!\nError: unable to read trailer block 0x%02x\n", iBlock);
} }