sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Fix CTLV three-byte tag parsing.

This commit is contained in:
Andrzej Zaborowski 2010-04-22 11:13:04 +02:00 committed by Denis Kenzior
parent fde23f113a
commit 6e28fd9396
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/simutil.c
View File

@ -210,7 +210,7 @@ void comprehension_tlv_iter_init(struct comprehension_tlv_iter *iter,
iter->data = 0;
}
/* Comprehension TLVs defined in Section 7 of ETSI TS 102.220 */
/* Comprehension TLVs defined in Section 7 of ETSI TS 101.220 */
gboolean comprehension_tlv_iter_next(struct comprehension_tlv_iter *iter)
{
const unsigned char *pdu = iter->pdu + iter->pos;
@ -222,15 +222,15 @@ gboolean comprehension_tlv_iter_next(struct comprehension_tlv_iter *iter)
if (pdu == end)
return FALSE;
if (*pdu == 0x00 || *pdu == 0xFF || *pdu == 0x80)
return FALSE;
cr = bit_field(*pdu, 7, 1);
tag = bit_field(*pdu, 0, 7);
pdu++;
if (tag == 0x00 || tag == 0xFF || tag == 0x80)
return FALSE;
/*
* ETSI TS 102.220, Section 7.1.1.2
* ETSI TS 101.220, Section 7.1.1.2
*
* If byte 1 of the tag is equal to 0x7F, then the tag is encoded
* on the following two bytes, with bit 8 of the 2nd byte of the tag
@ -241,7 +241,7 @@ gboolean comprehension_tlv_iter_next(struct comprehension_tlv_iter *iter)
return FALSE;
cr = bit_field(pdu[0], 7, 1);
tag = ((pdu[0] & 0x7f) << 7) | pdu[1];
tag = ((pdu[0] & 0x7f) << 8) | pdu[1];
if (tag < 0x0001 || tag > 0x7fff)
return FALSE;