diff options
| author | Andrzej Zaborowski <andrew.zaborowski@intel.com> | 2010-04-22 11:13:04 +0200 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2010-04-22 17:44:20 -0500 |
| commit | 6e28fd9396243540f769630aebe3c8dab978d56c (patch) | |
| tree | b62a828404eda94565202504b9baf67b9f25c451 /src/simutil.c | |
| parent | fde23f113ad243a7fd63f3f5104915956e9f15e0 (diff) | |
| download | ofono-6e28fd9396243540f769630aebe3c8dab978d56c.tar.bz2 | |
Fix CTLV three-byte tag parsing.
Diffstat (limited to 'src/simutil.c')
| -rw-r--r-- | src/simutil.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/simutil.c b/src/simutil.c index 9fb111f4..941c5517 100644 --- a/src/simutil.c +++ b/src/simutil.c @@ -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; |