diff --git a/src/stkutil.c b/src/stkutil.c index 5b97aeb7..0d4be68e 100644 --- a/src/stkutil.c +++ b/src/stkutil.c @@ -1225,6 +1225,24 @@ static gboolean parse_dataobj_uicc_te_interface( return TRUE; } +/* Defined in TS 102.223 Section 8.60 */ +static gboolean parse_dataobj_aid(struct comprehension_tlv_iter *iter, + void *user) +{ + struct stk_aid *aid = user; + const unsigned char *data; + unsigned char len = comprehension_tlv_iter_get_length(iter); + + if ((len > 16) || (len < 12)) + return FALSE; + + data = comprehension_tlv_iter_get_data(iter); + aid->len = len; + memcpy(aid->aid, data, len); + + return TRUE; +} + /* Defined in TS 102.223 Section 8.72 */ static gboolean parse_dataobj_text_attr(struct comprehension_tlv_iter *iter, void *user) @@ -1373,6 +1391,8 @@ static dataobj_handler handler_for_type(enum stk_data_object_type type) return parse_dataobj_other_address; case STK_DATA_OBJECT_TYPE_UICC_TE_INTERFACE: return parse_dataobj_uicc_te_interface; + case STK_DATA_OBJECT_TYPE_AID: + return parse_dataobj_aid; case STK_DATA_OBJECT_TYPE_TEXT_ATTRIBUTE: return parse_dataobj_text_attr; case STK_DATA_OBJECT_TYPE_FRAME_ID: diff --git a/src/stkutil.h b/src/stkutil.h index 1c7c9700..67e7ef78 100644 --- a/src/stkutil.h +++ b/src/stkutil.h @@ -337,6 +337,18 @@ enum stk_address_type { STK_ADDRESS_IPV6 = 0x57 }; +enum stk_access_technology_type { + STK_ACCESS_TECHNOLOGY_GSM = 0x00, + STK_ACCESS_TECHNOLOGY_TIA_EIA_553 = 0x01, + STK_ACCESS_TECHNOLOGY_TIA_EIA_136_C = 0x02, + STK_ACCESS_TECHNOLOGY_UTRAN = 0x03, + STK_ACCESS_TECHNOLOGY_TETRA = 0x04, + STK_ACCESS_TECHNOLOGY_TIA_EIA_95 = 0x05, + STK_ACCESS_TECHNOLOGY_CDMA2000_1X = 0x06, + STK_ACCESS_TECHNOLOGY_CDMA2000_HRPD = 0x07, + STK_ACCESS_TECHNOLOGY_EUTRAN = 0x08 +}; + /* For data object that only has a byte array with undetermined length */ struct stk_common_byte_array { unsigned char *array; @@ -576,6 +588,17 @@ struct stk_uicc_te_interface { unsigned short port; }; +/* + * Defined in TS 102.223 Section 8.60. + * According to 101.220, Section 4, aid contains two fields RID and PIX. + * RID has 5 bytes, while PIX contains information between 7 to 11 bytes. + * So the maximum size of aid is 16 bytes. + */ +struct stk_aid { + unsigned char aid[16]; + unsigned int len; +}; + /* * According to 102.223 Section 8.72 the length of text attribute CTLV is 1 * byte. This means that the maximum size is 127 according to the rules