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

Minor fixes for mifare-desfire-format.

Browse source 
- Free default_key;
- Really stop on error.
This commit is contained in:
Romain Tartiere 2010-09-30 06:02:30 +00:00
parent dd8e031e8c
commit 717cd9fecd
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
examples/mifare-desfire-format.c
View file

@ -77,7 +77,7 @@ main(int argc, char *argv[])
if (!device_count) if (!device_count)
errx (EXIT_FAILURE, "No NFC device found."); errx (EXIT_FAILURE, "No NFC device found.");
for (size_t d = 0; d < device_count; d++) { for (size_t d = 0; (!error) && (d < device_count); d++) {
device = nfc_connect (&(devices[d])); device = nfc_connect (&(devices[d]));
if (!device) { if (!device) {
warnx ("nfc_connect() failed."); warnx ("nfc_connect() failed.");
@ -110,7 +110,6 @@ main(int argc, char *argv[])
if (format) { if (format) {
int res; int res;
MifareDESFireKey default_key = mifare_desfire_des_key_new_with_version (null_key_data);
res = mifare_desfire_connect (tags[i]); res = mifare_desfire_connect (tags[i]);
if (res < 0) { if (res < 0) {
@ -119,12 +118,14 @@ main(int argc, char *argv[])
break; break;
} }
MifareDESFireKey default_key = mifare_desfire_des_key_new_with_version (null_key_data);
res = mifare_desfire_authenticate (tags[i], 0, default_key); res = mifare_desfire_authenticate (tags[i], 0, default_key);
if (res < 0) { if (res < 0) {
warnx ("Can't authenticate on Mifare DESFire target."); warnx ("Can't authenticate on Mifare DESFire target.");
error = EXIT_FAILURE; error = EXIT_FAILURE;
break; break;
} }
mifare_desfire_key_free (default_key);
res = mifare_desfire_format_picc (tags[i]); res = mifare_desfire_format_picc (tags[i]);
if (res < 0) { if (res < 0) {