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

Enhance the mifare-classic-write-ndef example.

Browse source 
- Only format the PICC if no MAD is present;
- Do not overwrite an existing MAD.
This commit is contained in:
Romain Tartiere 2010-08-31 12:00:02 +00:00
parent a5f1a80447
commit 7ba83f79ed
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
examples/mifare-classic-write-ndef.c
View file

@ -217,15 +217,16 @@ main(int argc, char *argv[])
/* /*
* At his point, we should have collected all information needed to * At his point, we should have collected all information needed to
* succeed. However, some sectors may be unaccessible if the card * succeed.
* is not blank, so mark them as used in the MAD.
*/ */
/* // If the card already has a MAD, load it.
* TODO Load and keep any existing MAD on the target. In this if ((mad = mad_read (tags[i]))) {
* case, only can free sectors for keys. // If our application already exists, erase it.
*/ mifare_application_free (mad, mad_nfcforum_aid);
} else {
// Create a MAD and mark unaccessible sectors in the card
if (!(mad = mad_new ((freefare_get_tag_type (tags[i]) == CLASSIC_4K) ? 2 : 1))) { if (!(mad = mad_new ((freefare_get_tag_type (tags[i]) == CLASSIC_4K) ? 2 : 1))) {
perror ("mad_new"); perror ("mad_new");
error = 1; error = 1;
@ -244,12 +245,25 @@ main(int argc, char *argv[])
/* Keep compiler quiet */ /* Keep compiler quiet */
break; break;
} }
MifareClassicKey transport_key = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
// Mark unusable sectors as so
for (size_t s = max_s; s; s--) { for (size_t s = max_s; s; s--) {
if (s == 0x10) continue; if (s == 0x10) continue;
if (!search_sector_key (tags[i], s, &(card_write_keys[s].key), &(card_write_keys[s].type))) { if (!search_sector_key (tags[i], s, &(card_write_keys[s].key), &(card_write_keys[s].type))) {
mad_set_aid (mad, s, mad_defect_aid); mad_set_aid (mad, s, mad_defect_aid);
} else if ((memcmp (card_write_keys[s].key, transport_key, sizeof (transport_key)) != 0) &&
(card_write_keys[s].type != MFC_KEY_A)) {
// Revert to transport configuration
if (mifare_classic_format_sector (tags[i], s) < 0) {
perror ("mifare_classic_format_sector");
error = 1;
goto error;
}
} }
} }
}
MifareClassicSectorNumber *sectors = mifare_application_alloc (mad, mad_nfcforum_aid, encoded_size); MifareClassicSectorNumber *sectors = mifare_application_alloc (mad, mad_nfcforum_aid, encoded_size);
if (!sectors) { if (!sectors) {