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

Ugly fix as workaround of FIXME mifare_desfire.c read_data()

Browse source
This commit is contained in:
Philippe Teuwen 2013-04-29 00:51:06 +02:00
parent 29235a0295
commit 00e999dd52
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/mifare-desfire-read-ndef.c
View file

@ -207,7 +207,7 @@ main(int argc, char *argv[])
errx (EXIT_FAILURE, "Authentication with NDEF Tag Application master key failed"); errx (EXIT_FAILURE, "Authentication with NDEF Tag Application master key failed");
// Read Capability Container file E103 // Read Capability Container file E103
uint8_t lendata[2]; uint8_t lendata[20]; // cf FIXME in mifare_desfire.c read_data()
if (info.software.version_major==0) if (info.software.version_major==0)
res = mifare_desfire_read_data (tags[i], 0x03, 0, 2, lendata); res = mifare_desfire_read_data (tags[i], 0x03, 0, 2, lendata);
else else
@ -219,7 +219,7 @@ main(int argc, char *argv[])
uint16_t cclen = (((uint16_t) lendata[0]) << 8) + ((uint16_t) lendata[1]); uint16_t cclen = (((uint16_t) lendata[0]) << 8) + ((uint16_t) lendata[1]);
if (cclen < 15) if (cclen < 15)
errx (EXIT_FAILURE, "CC too short IMHO"); errx (EXIT_FAILURE, "CC too short IMHO");
if (!(cc_data = malloc(cclen))) if (!(cc_data = malloc(cclen+20))) // cf FIXME in mifare_desfire.c read_data()
errx (EXIT_FAILURE, "malloc"); errx (EXIT_FAILURE, "malloc");
if (info.software.version_major==0) if (info.software.version_major==0)
res = mifare_desfire_read_data (tags[i], 0x03, 0, cclen, cc_data); res = mifare_desfire_read_data (tags[i], 0x03, 0, cclen, cc_data);
@ -246,7 +246,7 @@ main(int argc, char *argv[])
file_no = 2; file_no = 2;
uint16_t ndefmaxlen = (((uint16_t) cc_data[off+4]) << 8) + ((uint16_t) cc_data[off+5]); uint16_t ndefmaxlen = (((uint16_t) cc_data[off+4]) << 8) + ((uint16_t) cc_data[off+5]);
fprintf (message_stream, "Max NDEF size: %i bytes\n", ndefmaxlen); fprintf (message_stream, "Max NDEF size: %i bytes\n", ndefmaxlen);
if (!(ndef_msg = malloc(ndefmaxlen))) if (!(ndef_msg = malloc(ndefmaxlen+20))) // cf FIXME in mifare_desfire.c read_data()
errx (EXIT_FAILURE, "malloc"); errx (EXIT_FAILURE, "malloc");
res = mifare_desfire_read_data (tags[i], file_no, 0, 2, lendata); res = mifare_desfire_read_data (tags[i], file_no, 0, 2, lendata);

4
examples/mifare-desfire-write-ndef.c
View file

@ -236,7 +236,7 @@ main(int argc, char *argv[])
errx (EXIT_FAILURE, "Authentication with NDEF Tag Application master key failed"); errx (EXIT_FAILURE, "Authentication with NDEF Tag Application master key failed");
// Read Capability Container file E103 // Read Capability Container file E103
uint8_t lendata[2]; uint8_t lendata[20]; // cf FIXME in mifare_desfire.c read_data()
if (info.software.version_major==0) if (info.software.version_major==0)
res = mifare_desfire_read_data (tags[i], 0x03, 0, 2, lendata); res = mifare_desfire_read_data (tags[i], 0x03, 0, 2, lendata);
@ -249,7 +249,7 @@ main(int argc, char *argv[])
uint16_t cclen = (((uint16_t) lendata[0]) << 8) + ((uint16_t) lendata[1]); uint16_t cclen = (((uint16_t) lendata[0]) << 8) + ((uint16_t) lendata[1]);
if (cclen < 15) if (cclen < 15)
errx (EXIT_FAILURE, "CC too short IMHO"); errx (EXIT_FAILURE, "CC too short IMHO");
if (!(cc_data = malloc(cclen))) if (!(cc_data = malloc(cclen + 20))) // cf FIXME in mifare_desfire.c read_data()
errx (EXIT_FAILURE, "malloc"); errx (EXIT_FAILURE, "malloc");
if (info.software.version_major==0) if (info.software.version_major==0)
res = mifare_desfire_read_data (tags[i], 0x03, 0, cclen, cc_data); res = mifare_desfire_read_data (tags[i], 0x03, 0, cclen, cc_data);