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

Fix TLV terminator. 0xFE is part of TLV, not NDEF.

Browse source
This commit is contained in:
Romain Tartiere 2010-06-23 23:21:47 +00:00
parent 4e3cccd071
commit a235dbd0a9
3 changed files with 43 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libfreefare/tlv.c
View file

@ -17,6 +17,15 @@
* $Id$
*/
/*
* This implementation was written based on information provided by the
* following documents:
*
* NFC Forum - Type 1 Tag Operation Specification
* NFCForum-TS-Type-1-Tag_1.0
* 2007-07-09
*/
#include "config.h"
#include <stdlib.h>
#include <string.h>
@ -25,6 +34,8 @@
#include <freefare.h>
#define TLV_TERMINATOR 0xFE
/*
* TLV (Type Length Value) Manipulation Functions.
*/
@ -44,7 +55,8 @@ tlv_encode (const uint8_t type, const uint8_t *istream, uint16_t isize, size_t *
if (isize == 0xffff) /* RFU */
return NULL;
if ((res = malloc (1 + ((isize > 254) ? 3 : 1) + isize))) {
if ((res = malloc (1 + ((isize > 254) ? 3 : 1) + isize + 1))) {
/* type + size + payload + terminator */
res[n++] = type;
if (isize > 254) {
@ -57,8 +69,12 @@ tlv_encode (const uint8_t type, const uint8_t *istream, uint16_t isize, size_t *
}
memcpy (res + n, istream, isize);
n += isize;
res[n++] = TLV_TERMINATOR;
if (osize)
*osize = isize + n;
*osize = n;
}
return res;
}