fix(mifare): preserve readable Key B in sector trailer dumps

This commit is contained in:
oSPANNERo committed 2026-08-17 19:19:12 -04:00
1 parent 2362cabcd4
commit f1fc9adaed
2 files changed
+6 -2

No files matched your search

+5 -2
View File
@@ -1085,9 +1085,12 @@ static int mfc_read_tag(iso14a_card_select_t *card, uint8_t *carddata, uint8_t n
uint8_t *data = resp.data.asBytes;
if (mfIsSectorTrailerBasedOnBlocks(sectorNo, blockNo)) {
// sector trailer. Fill in the keys.
// sector trailer. Key A is never readable; preserve Key B when ACL allows it.
memcpy(data, keyA + (sectorNo * MIFARE_KEY_SIZE), MIFARE_KEY_SIZE);
memcpy(data + 10, keyB + (sectorNo * MIFARE_KEY_SIZE), MIFARE_KEY_SIZE);
uint8_t trailer_acl = mf_get_accesscondition(3, &data[6]);
if (trailer_acl != 0 && trailer_acl != 1 && trailer_acl != 2) {
memcpy(data + 10, keyB + (sectorNo * MIFARE_KEY_SIZE), MIFARE_KEY_SIZE);
}
}
memcpy(carddata + (MFBLOCK_SIZE * (mfFirstBlockOfSector(sectorNo) + blockNo)), data, MFBLOCK_SIZE);