February 2022 - gerrit-log - lists.osmocom.org

Change in pysim[master]: ts_31_103: TLV definitions for IMS, XCAP and MudMid configuration

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27186 ) Change subject: ts_31_103: TLV definitions for IMS, XCAP and MudMid configuration ...................................................................... ts_31_103: TLV definitions for IMS, XCAP and MudMid configuration Change-Id: I9a90ee978db668a70259eb48085ff5384cf696d6 --- M pySim/ts_31_103.py 1 file changed, 56 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py index 66124a8..fb164ef 100644 --- a/pySim/ts_31_103.py +++ b/pySim/ts_31_103.py @@ -176,13 +176,61 @@ # TS 31.103 Section 4.2.18 class EF_IMSConfigData(BerTlvEF): + class ImsConfigDataEncoding(BER_TLV_IE, tag=0x80): + _construct = HexAdapter(Bytes(1)) + class ImsConfigData(BER_TLV_IE, tag=0x81): + _construct = GreedyString + # pylint: disable=undefined-variable + class ImsConfigDataCollection(TLV_IE_Collection, neted=[ImsConfigDataEncoding, ImsConfigData]): + pass def __init__(self, fid='6ff8', sfid=None, name='EF.IMSConfigData', desc='IMS Configuration Data', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._tlv = EF_IMSConfigData.ImsConfigDataCollection # TS 31.103 Section 4.2.19 class EF_XCAPConfigData(BerTlvEF): + class Access(BER_TLV_IE, tag=0x81): + pass + class ApplicationName(BER_TLV_IE, tag=0x82): + pass + class ProviderID(BER_TLV_IE, tag=0x83): + pass + class URI(BER_TLV_IE, tag=0x84): + pass + class XcapAuthenticationUserName(BER_TLV_IE, tag=0x85): + pass + class XcapAuthenticationPassword(BER_TLV_IE, tag=0x86): + pass + class XcapAuthenticationType(BER_TLV_IE, tag=0x87): + pass + class AddressType(BER_TLV_IE, tag=0x88): + pass + class Address(BER_TLV_IE, tag=0x89): + pass + class PDPAuthenticationType(BER_TLV_IE, tag=0x8a): + pass + class PDPAuthenticationName(BER_TLV_IE, tag=0x8b): + pass + class PDPAuthenticationSecret(BER_TLV_IE, tag=0x8c): + pass + + class AccessForXCAP(BER_TLV_IE, tag=0x81): + pass + class NumberOfXcapConnParPolicy(BER_TLV_IE, tag=0x82): + _construct = Int8ub + # pylint: disable=undefined-variable + class XcapConnParamsPolicyPart(BER_TLV_IE, tag=0xa1, nested=[Access, ApplicationName, ProviderID, URI, + XcapAuthenticationUserName, XcapAuthenticationPassword, + XcapAuthenticationType, AddressType, Address, PDPAuthenticationType, + PDPAuthenticationName, PDPAuthenticationSecret]): + pass + class XcapConnParamsPolicy(BER_TLV_IE, tag=0xa0, nested=[AccessForXCAP, NumberOfXcapConnParPolicy, XcapConnParamsPolicyPart]): + pass + class XcapConnParamsPolicyDO(BER_TLV_IE, tag=0x80, nested=[XcapConnParamsPolicy]): + pass def __init__(self, fid='6ffc', sfid=None, name='EF.XCAPConfigData', desc='XCAP Configuration Data', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._tlv = EF_XCAPConfigData.XcapConnParamsPolicy # TS 31.103 Section 4.2.20 class EF_WebRTCURI(TransparentEF): @@ -195,9 +243,17 @@ # TS 31.103 Section 4.2.21 class EF_MuDMiDConfigData(BerTlvEF): + class MudMidConfigDataEncoding(BER_TLV_IE, tag=0x80): + _construct = HexAdapter(Bytes(1)) + class MudMidConfigData(BER_TLV_IE, tag=0x81): + _construct = GreedyString + # pylint: disable=undefined-variable + class MudMidConfigDataCollection(TLV_IE_Collection, neted=[MudMidConfigDataEncoding, MudMidConfigData]): + pass def __init__(self, fid='6ffe', sfid=None, name='EF.MuDMiDConfigData', desc='MuD and MiD Configuration Data', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._tlv = EF_MuDMiDConfigData.MudMidConfigDataCollection class ADF_ISIM(CardADF): 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9a90ee978db668a70259eb48085ff5384cf696d6 Gerrit-Change-Number: 27186 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: herlesupreeth <herlesupreeth(a)gmail.com> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in pysim[master]: pySim-shell: Allow selecting of deep paths like DF.GSM/EF.IMSI

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27187 ) Change subject: pySim-shell: Allow selecting of deep paths like DF.GSM/EF.IMSI ...................................................................... pySim-shell: Allow selecting of deep paths like DF.GSM/EF.IMSI With this patch applied, users can directly enter commands like select DF.GSM/EF.IMSI or select ADF.USIM/DF.5GS/EF.5GAUTHKEYS This feature doesn't have tabl completion, so it's mostly useful for when you know what to select, or for use within scripts. Change-Id: I681a132eb2df4b2aba4c2ccbdd21c6d5b88443e3 --- M pySim/filesystem.py 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim/filesystem.py b/pySim/filesystem.py index d1c3e1f..bef9005 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -1411,6 +1411,22 @@ name : Name of file to select cmd_app : Command Application State (for unregistering old file commands) """ + # handling of entire paths with multiple directories/elements + if '/' in name: + prev_sel_file = self.selected_file + pathlist = name.split('/') + # treat /DF.GSM/foo like MF/DF.GSM/foo + if pathlist[0] == '': + pathlist[0] = 'MF' + try: + for p in pathlist: + self.select(p, cmd_app) + return + except Exception as e: + # if any intermediate step fails, go back to where we were + self.select_file(prev_sel_file, cmd_app) + raise e + sels = self.selected_file.get_selectables() if is_hex(name): name = name.lower() 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27187 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I681a132eb2df4b2aba4c2ccbdd21c6d5b88443e3 Gerrit-Change-Number: 27187 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in pysim[master]: ts_51_011: Proper decode of EF.SMSP

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27183 ) Change subject: ts_51_011: Proper decode of EF.SMSP ...................................................................... ts_51_011: Proper decode of EF.SMSP Full decode of the SSM Parameters File Change-Id: Iac5bb87ed3350978dc8b207f052510fdba2e4883 --- M pySim/construct.py M pySim/ts_51_011.py 2 files changed, 62 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/pySim/construct.py b/pySim/construct.py index 6daa66a..fcbadd8 100644 --- a/pySim/construct.py +++ b/pySim/construct.py @@ -2,7 +2,7 @@ from construct.core import EnumIntegerString import typing from construct import * -from construct.core import evaluate, bytes2integer, integer2bytes +from construct.core import evaluate, bytes2integer, integer2bytes, BitwisableString from construct.lib import integertypes from pySim.utils import b2h, h2b, swap_nibbles import gsm0338 @@ -44,6 +44,25 @@ def _encode(self, obj, context, path): return h2b(swap_nibbles(obj)) +class InvertAdapter(Adapter): + """inverse logic (false->true, true->false).""" + @staticmethod + def _invert_bool_in_obj(obj): + for k,v in obj.items(): + # skip all private entries + if k.startswith('_'): + continue + if v == False: + obj[k] = True + elif v == True: + obj[k] = False + return obj + + def _decode(self, obj, context, path): + return self._invert_bool_in_obj(obj) + + def _encode(self, obj, context, path): + return self._invert_bool_in_obj(obj) class Rpad(Adapter): """ @@ -228,3 +247,11 @@ data = swapbytes(data) stream_write(stream, data, length, path) return obj + +# merged definitions of 24.008 + 23.040 +TypeOfNumber = Enum(BitsInteger(3), unknown=0, international=1, national=2, network_specific=3, + short_code=4, alphanumeric=5, abbreviated=6, reserved_for_extension=7) +NumberingPlan = Enum(BitsInteger(4), unknown=0, isdn_e164=1, data_x121=3, telex_f69=4, + sc_specific_5=5, sc_specific_6=6, national=8, private=9, + ermes=10, reserved_cts=11, reserved_for_extension=15) +TonNpi = BitStruct('ext'/Flag, 'type_of_number'/TypeOfNumber, 'numbering_plan_id'/NumberingPlan) diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index f9f1e2a..c29b54c 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -402,8 +402,42 @@ # TS 51.011 Section 10.5.6 class EF_SMSP(LinFixedEF): + class ValidityPeriodAdapter(Adapter): + def _decode(self, obj, context, path): + if obj <= 143: + return obj + 1 * 5 + elif obj <= 167: + return 12 * 60 + ((obj - 143) * 30) + elif obj <= 196: + return (obj - 166) * (24 * 60) + elif obj <= 255: + return (obj - 192) * (7 * 24 * 60) + else: + raise ValueError + def _encode(self, obj, context, path): + if obj <= 12*60: + return obj/5 - 1 + elif obj <= 24*60: + return 143 + ((obj - (12 * 60)) / 30) + elif obj <= 30 * 24 * 60: + return 166 + (obj / (24 * 60)) + elif obj <= 63 * 7 * 24 * 60: + return 192 + (obj / (7 * 24 * 60)) + else: + raise ValueError + def __init__(self, fid='6f42', sfid=None, name='EF.SMSP', desc='Short message service parameters', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len={28, None}, **kwargs) + ScAddr = Struct('length'/Int8ub, 'ton_npi'/TonNpi, 'call_number'/BcdAdapter(Rpad(Bytes(10)))) + self._construct = Struct('alpha_id'/COptional(GsmStringAdapter(Rpad(Bytes(this._.total_len-28)))), + 'parameter_indicators'/InvertAdapter(FlagsEnum(Byte, tp_dest_addr=1, tp_sc_addr=2, + tp_pid=3, tp_dcs=4, tp_vp=5)), + 'tp_dest_addr'/ScAddr, + 'tp_sc_addr'/ScAddr, + + 'tp_pid'/HexAdapter(Bytes(1)), + 'tp_dcs'/HexAdapter(Bytes(1)), + 'tp_vp_minutes'/EF_SMSP.ValidityPeriodAdapter(Byte)) # TS 51.011 Section 10.5.7 class EF_SMSS(TransparentEF): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27183 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iac5bb87ed3350978dc8b207f052510fdba2e4883 Gerrit-Change-Number: 27183 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in pysim[master]: ts_51_011: Convert EF_ADN and EF_ACC to Construct

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27184 ) Change subject: ts_51_011: Convert EF_ADN and EF_ACC to Construct ...................................................................... ts_51_011: Convert EF_ADN and EF_ACC to Construct this has the benefit of providing encoding support for free. Change-Id: I31c118082e92892486c3688de2197c0c6dd2750e --- M pySim/ts_51_011.py 1 file changed, 7 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index c29b54c..890b85b 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -343,13 +343,12 @@ class EF_ADN(LinFixedEF): def __init__(self, fid='6f3a', sfid=None, name='EF.ADN', desc='Abbreviated Dialing Numbers', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len={14, 30}, **kwargs) - - def _decode_record_bin(self, raw_bin_data): - alpha_id_len = len(raw_bin_data) - 14 - alpha_id = raw_bin_data[:alpha_id_len] - u = unpack('!BB10sBB', raw_bin_data[-14:]) - return {'alpha_id': alpha_id, 'len_of_bcd': u[0], 'ton_npi': u[1], - 'dialing_nr': u[2], 'cap_conf_id': u[3], 'ext1_record_id': u[4]} + self._construct = Struct('alpha_id'/COptional(GsmStringAdapter(Rpad(Bytes(this._.total_len-14)), codec='ascii')), + 'len_of_bcd'/Int8ub, + 'ton_npi'/TonNpi, + 'dialing_nr'/BcdAdapter(Rpad(Bytes(10))), + 'cap_conf_id'/Int8ub, + 'ext1_record_id'/Int8ub) # TS 51.011 Section 10.5.5 class EF_SMS(LinFixedEF): @@ -656,12 +655,7 @@ def __init__(self, fid='6f78', sfid=None, name='EF.ACC', desc='Access Control Class', size={2, 2}, **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) - - def _decode_bin(self, raw_bin): - return {'acc': unpack('!H', raw_bin)[0]} - - def _encode_bin(self, abstract): - return pack('!H', abstract['acc']) + self._construct = HexAdapter(Bytes(2)) # TS 51.011 Section 10.3.16 class EF_LOCI(TransparentEF): 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I31c118082e92892486c3688de2197c0c6dd2750e Gerrit-Change-Number: 27184 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in pysim[master]: ts_51_011: EF_CMI: Decoder the alpha_id string

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27185 ) Change subject: ts_51_011: EF_CMI: Decoder the alpha_id string ...................................................................... ts_51_011: EF_CMI: Decoder the alpha_id string Change-Id: I45efe29ab98972945b4257229a995815f5632536 --- M pySim/ts_51_011.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 890b85b..5e430ea 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -472,7 +472,7 @@ desc='Comparison Method Information', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) self._construct = Struct( - 'alpha_id'/Bytes(this._.total_len-1), 'comparison_method_id'/Int8ub) + 'alpha_id'/GsmStringAdapter(Rpad(Bytes(this._.total_len-1))), 'comparison_method_id'/Int8ub) class DF_TELECOM(CardDF): 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I45efe29ab98972945b4257229a995815f5632536 Gerrit-Change-Number: 27185 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in pysim[master]: ust_service_check: proper treatment of files in sub-directories

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27181 ) Change subject: ust_service_check: proper treatment of files in sub-directories ...................................................................... ust_service_check: proper treatment of files in sub-directories We must not only consider files in the current directory (ADF.USIM) but also in its sub-directories. This requires us to be able to determine the path we need to traverse between the currently selected file (EF.UST) and the respective file in some other directory, which is implemented via CardFile.build_select_path_to(). Change-Id: I61797fefa9dafa36a8a62c11aa2cfaeecb015740 --- M pySim/filesystem.py M pySim/ts_31_102.py 2 files changed, 71 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/filesystem.py b/pySim/filesystem.py index dd80071..d1c3e1f 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -115,6 +115,34 @@ ret.append(elem) return ret + def fully_qualified_path_fobj(self) -> List['CardFile']: + """Return fully qualified path to file as list of CardFile instance references.""" + if self.parent and self.parent != self: + ret = self.parent.fully_qualified_path_fobj() + else: + ret = [] + if self: + ret.append(self) + return ret + + def build_select_path_to(self, target: 'CardFile') -> Optional[List['CardFile']]: + """Build the relative sequence of files we need to traverse to get from us to 'target'.""" + cur_fqpath = self.fully_qualified_path_fobj() + target_fqpath = target.fully_qualified_path_fobj() + inter_path = [] + cur_fqpath.pop() # drop last element (currently selected file, doesn't need re-selection + cur_fqpath.reverse() + for ce in cur_fqpath: + inter_path.append(ce) + for i in range(0, len(target_fqpath)-1): + te = target_fqpath[i] + if te == ce: + for te2 in target_fqpath[i+1:]: + inter_path.append(te2) + # we found our common ancestor + return inter_path + return None + def get_mf(self) -> Optional['CardMF']: """Return the MF (root) of the file system.""" if self.parent == None: @@ -1337,6 +1365,45 @@ self.selected_file = f return select_resp + def _select_pre(self, cmd_app): + # unregister commands of old file + if cmd_app and self.selected_file.shell_commands: + for c in self.selected_file.shell_commands: + cmd_app.unregister_command_set(c) + + def _select_post(self, cmd_app): + # register commands of new file + if cmd_app and self.selected_file.shell_commands: + for c in self.selected_file.shell_commands: + cmd_app.register_command_set(c) + + def select_file(self, file: CardFile, cmd_app=None): + """Select a file (EF, DF, ADF, MF, ...). + + Args: + file : CardFile [or derived class] instance + cmd_app : Command Application State (for unregistering old file commands) + """ + # we need to find a path from our self.selected_file to the destination + inter_path = self.selected_file.build_select_path_to(file) + if not inter_path: + raise RuntimeError('Cannot determine path from %s to %s' % (self.selected_file, file)) + + self._select_pre(cmd_app) + + for p in inter_path: + try: + if isinstance(p, CardADF): + (data, sw) = self.card.select_adf_by_aid(p.aid) + else: + (data, sw) = self.card._scc.select_file(p.fid) + self.selected_file = p + except SwMatchError as swm: + self._select_post(cmd_app) + raise(swm) + + self._select_post(cmd_app) + def select(self, name: str, cmd_app=None): """Select a file (EF, DF, ADF, MF, ...). @@ -1348,10 +1415,7 @@ if is_hex(name): name = name.lower() - # unregister commands of old file - if cmd_app and self.selected_file.shell_commands: - for c in self.selected_file.shell_commands: - cmd_app.unregister_command_set(c) + self._select_pre(cmd_app) if name in sels: f = sels[name] @@ -1372,11 +1436,7 @@ # store the decoded FCP for later reference self.selected_file_fcp = select_resp - # register commands of new file - if cmd_app and self.selected_file.shell_commands: - for c in self.selected_file.shell_commands: - cmd_app.register_command_set(c) - + self._select_post(cmd_app) return select_resp def status(self): diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 447ef95..7d0eb28 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -608,12 +608,8 @@ for f in files_by_service[s]: should_exist = f.should_exist_for_services(active_services) try: - (data, sw) = cmd.card._scc.select_file(f.fid) + cmd.rs.select_file(f) exists = True - fcp = f.decode_select_response(data) - # if we just selected a directory, go back - if fcp['file_descriptor']['file_type'] == 'df': - cmd.card._scc.select_parent_df() except SwMatchError as e: sw = str(e) exists = False @@ -625,7 +621,7 @@ cmd.perror(" ERROR: File %s is not selectable (%s) but should!" % (f, sw)) finally: # re-select the EF.UST - cmd.card._scc.select_file(self.fid) + cmd.rs.select_file(self) return num_problems class EF_UST(EF_UServiceTable): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I61797fefa9dafa36a8a62c11aa2cfaeecb015740 Gerrit-Change-Number: 27181 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in pysim[master]: ts_31_102: service annotations for DF.{5GS,WLAN,HNB}

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27180 ) Change subject: ts_31_102: service annotations for DF.{5GS,WLAN,HNB} ...................................................................... ts_31_102: service annotations for DF.{5GS,WLAN,HNB} We had service annotations only for ADF.USIM so far, but not for the related sub-directories. Change-Id: Iaa56a26ba53eaf18fce14845ae07a27c52a2c58a Note: The code doesn't make use of them in any reasonable way yet! --- M pySim/filesystem.py M pySim/ts_31_102.py 2 files changed, 51 insertions(+), 46 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 95f792a..dd80071 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -302,7 +302,13 @@ "File with given name %s already exists in %s" % (child.name, self)) self.children[child.fid] = child child.parent = self + # update the service -> file relationship table self._add_file_services(child) + if isinstance(child, CardDF): + for c in child.children.values(): + self._add_file_services(c) + if isinstance(c, CardDF): + raise ValueError('TODO: implement recursive service -> file mapping') def add_files(self, children: Iterable[CardFile], ignore_existing: bool = False): """Add a list of child (DF/EF) to this DF diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 7fcb08e..447ef95 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -332,8 +332,8 @@ pass def __init__(self, fid="4f03", sfid=0x03, name='EF.5GS3GPPNSC', rec_len={57, None}, - desc='5GS 3GPP Access NAS Security Context'): - super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len) + desc='5GS 3GPP Access NAS Security Context', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) self._tlv = EF_5GS3GPPNSC.FiveGSNasSecurityContext # 3GPP TS 31.102 Section 4.4.11.6 @@ -348,8 +348,8 @@ pass def __init__(self, fid='4f05', sfid=0x05, name='EF.5GAUTHKEYS', size={68, None}, - desc='5G authentication keys'): - super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) + desc='5G authentication keys', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._tlv = EF_5GAUTHKEYS.FiveGAuthKeys # 3GPP TS 31.102 Section 4.4.11.8 @@ -382,8 +382,8 @@ # TS 31.102 4.4.11.8 class EF_SUCI_Calc_Info(TransparentEF): def __init__(self, fid="4f07", sfid=0x07, name='EF.SUCI_Calc_Info', size={2, None}, - desc='SUCI Calc Info'): - super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) + desc='SUCI Calc Info', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) def _encode_prot_scheme_id_list(self, in_list): out_bytes = [0xa0] @@ -1019,8 +1019,8 @@ # TS 31.102 Section 4.4.11.2 class EF_5GS3GPPLOCI(TransparentEF): def __init__(self, fid='4f01', sfid=0x01, name='EF.5GS3GPPLOCI', size={20, 20}, - desc='5S 3GP location information'): - super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) + desc='5S 3GP location information', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) upd_status_constr = Enum( Byte, updated=0, not_updated=1, roaming_not_allowed=2) self._construct = Struct('5g_guti'/Bytes(13), 'last_visited_registered_tai_in_5gs'/Bytes(6), @@ -1029,17 +1029,16 @@ # TS 31.102 Section 4.4.11.7 class EF_UAC_AIC(TransparentEF): def __init__(self, fid='4f06', sfid=0x06, name='EF.UAC_AIC', size={4, 4}, - desc='UAC Access Identities Configuration'): - super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) + desc='UAC Access Identities Configuration', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) cfg_constr = FlagsEnum(Byte, multimedia_priority_service=1, mission_critical_service=2) self._construct = Struct('uac_access_id_config'/cfg_constr) # TS 31.102 Section 4.4.11.9 class EF_OPL5G(LinFixedEF): - def __init__(self, fid='6f08', sfid=0x08, name='EF.OPL5G', desc='5GS Operator PLMN List'): - super().__init__(fid=fid, sfid=sfid, - name=name, desc=desc, rec_len={10, None}) + def __init__(self, fid='6f08', sfid=0x08, name='EF.OPL5G', desc='5GS Operator PLMN List', **kwargs): + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len={10, None}, **kwargs) self._construct = Struct('tai'/Bytes(9), 'pnn_record_id'/Int8ub) # TS 31.102 Section 4.4.11.10 @@ -1060,8 +1059,8 @@ nested=[NetworkSpecificIdentifier, GlobalLineIdentifier, GlobalCableIdentifier]): pass def __init__(self, fid='4f09', sfid=0x09, name='EF.SUPI_NAI', - desc='SUPI as Network Access Identifier'): - super().__init__(fid, sfid=sfid, name=name, desc=desc) + desc='SUPI as Network Access Identifier', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) self._tlv = EF_SUPI_NAI.NAI_TLV_Collection @@ -1069,8 +1068,8 @@ class ServingNetworkName(BER_TLV_IE, tag=0x80): _construct = GreedyString("utf8") def __init__(self, fid='4f0c', sfid=0x0c, name='EF.TN3GPPSNN', - desc='Trusted non-3GPP Serving network names list'): - super().__init__(fid, sfid=sfid, name=name, desc=desc) + desc='Trusted non-3GPP Serving network names list', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) self._tlv = EF_TN3GPPSNN.ServingNetworkName # TS 31.102 Section 4.4.5 @@ -1078,27 +1077,27 @@ def __init__(self, fid='5f40', name='DF.WLAN', desc='Files for WLAN purpose', **kwargs): super().__init__(fid=fid, name=name, desc=desc, **kwargs) files = [ - TransparentEF('4f41', 0x01, 'EF.Pseudo', 'Pseudonym'), + TransparentEF('4f41', 0x01, 'EF.Pseudo', 'Pseudonym', service=59), TransparentEF('4f42', 0x02, 'EF.UPLMNWLAN', - 'User controlled PLMN selector for I-WLAN Access'), + 'User controlled PLMN selector for I-WLAN Access', service=60), TransparentEF('4f43', 0x03, 'EF.OPLMNWLAN', - 'Operator controlled PLMN selector for I-WLAN Access'), + 'Operator controlled PLMN selector for I-WLAN Access', service=61), LinFixedEF('4f44', 0x04, 'EF.UWSIDL', - 'User controlled WLAN Specific Identifier List'), + 'User controlled WLAN Specific Identifier List', service=62), LinFixedEF('4f45', 0x05, 'EF.OWSIDL', - 'Operator controlled WLAN Specific Identifier List'), + 'Operator controlled WLAN Specific Identifier List', service=63), TransparentEF('4f46', 0x06, 'EF.WRI', - 'WLAN Reauthentication Identity'), + 'WLAN Reauthentication Identity', service=66), LinFixedEF('4f47', 0x07, 'EF.HWSIDL', - 'Home I-WLAN Specific Identifier List'), + 'Home I-WLAN Specific Identifier List', service=81), TransparentEF('4f48', 0x08, 'EF.WEHPLMNPI', - 'I-WLAN Equivalent HPLMN Presentation Indication'), + 'I-WLAN Equivalent HPLMN Presentation Indication', service=82), TransparentEF('4f49', 0x09, 'EF.WHPI', - 'I-WLAN HPLMN Priority Indication'), + 'I-WLAN HPLMN Priority Indication', service=83), TransparentEF('4f4a', 0x0a, 'EF.WLRPLMN', - 'I-WLAN Last Registered PLMN'), + 'I-WLAN Last Registered PLMN', service=84), TransparentEF('4f4b', 0x0b, 'EF.HPLMNDAI', - 'HPLMN Direct Access Indicator'), + 'HPLMN Direct Access Indicator', service=88), ] self.add_files(files) @@ -1107,12 +1106,12 @@ def __init__(self, fid='5f50', name='DF.HNB', desc='Files for HomeNodeB purpose', **kwargs): super().__init__(fid=fid, name=name, desc=desc, **kwargs) files = [ - LinFixedEF('4f01', 0x01, 'EF.ACSGL', 'Allowed CSG Lists'), - LinFixedEF('4f02', 0x02, 'EF.CSGTL', 'CSG Types'), - LinFixedEF('4f03', 0x03, 'EF.HNBN', 'Home NodeB Name'), - LinFixedEF('4f04', 0x04, 'EF.OCSGL', 'Operator CSG Lists'), - LinFixedEF('4f05', 0x05, 'EF.OCSGT', 'Operator CSG Type'), - LinFixedEF('4f06', 0x06, 'EF.OHNBN', 'Operator Home NodeB Name'), + LinFixedEF('4f01', 0x01, 'EF.ACSGL', 'Allowed CSG Lists', service=86), + LinFixedEF('4f02', 0x02, 'EF.CSGTL', 'CSG Types', service=86), + LinFixedEF('4f03', 0x03, 'EF.HNBN', 'Home NodeB Name', service=86), + LinFixedEF('4f04', 0x04, 'EF.OCSGL', 'Operator CSG Lists', service=90), + LinFixedEF('4f05', 0x05, 'EF.OCSGT', 'Operator CSG Type', service=90), + LinFixedEF('4f06', 0x06, 'EF.OHNBN', 'Operator Home NodeB Name', service=90), ] self.add_files(files) @@ -1154,22 +1153,22 @@ super().__init__(fid=fid, name=name, desc=desc, **kwargs) files = [ # I'm looking at 31.102 R16.6 - EF_5GS3GPPLOCI(), + EF_5GS3GPPLOCI(service=122), EF_5GS3GPPLOCI('4f02', 0x02, 'EF.5GSN3GPPLOCI', - '5GS non-3GPP location information'), - EF_5GS3GPPNSC(), + '5GS non-3GPP location information', service=122), + EF_5GS3GPPNSC(service=122), EF_5GS3GPPNSC('4f04', 0x04, 'EF.5GSN3GPPNSC', - '5GS non-3GPP Access NAS Security Context'), - EF_5GAUTHKEYS(), - EF_UAC_AIC(), - EF_SUCI_Calc_Info(), - EF_OPL5G(), - EF_SUPI_NAI(), + '5GS non-3GPP Access NAS Security Context', service=122), + EF_5GAUTHKEYS(service=123), + EF_UAC_AIC(service=126), + EF_SUCI_Calc_Info(service=124), + EF_OPL5G(service=129), + EF_SUPI_NAI(service=130), TransparentEF('4F0A', 0x0a, 'EF.Routing_Indicator', - 'Routing Indicator', size={4, 4}), + 'Routing Indicator', size={4, 4}, service=124), TransparentEF('4F0B', 0x0b, 'EF.URSP', - 'UE Route Selector Policies per PLMN'), - EF_TN3GPPSNN(), + 'UE Route Selector Policies per PLMN', service=132), + EF_TN3GPPSNN(service=133), ] self.add_files(files) 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iaa56a26ba53eaf18fce14845ae07a27c52a2c58a Gerrit-Change-Number: 27180 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in pysim[master]: Improve IST/UST check documentation (for the user manual)

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27182 ) Change subject: Improve IST/UST check documentation (for the user manual) ...................................................................... Improve IST/UST check documentation (for the user manual) Change-Id: I18093d795721f2e729eff858c8922edde9e84451 --- M pySim/ts_31_102.py M pySim/ts_31_103.py 2 files changed, 15 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 7d0eb28..3995dfa 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -644,7 +644,12 @@ self._cmd.card.update_ust(int(arg), 0) def do_ust_service_check(self, arg): - """Check consistency between services of this file and files present/activated""" + """Check consistency between services of this file and files present/activated. + + Many services determine if one or multiple files shall be present/activated or if they shall be + absent/deactivated. This performs a consistency check to ensure that no services are activated + for files that are not - and vice-versa, no files are activated for services that are not. Error + messages are printed for every inconsistency found.""" selected_file = self._cmd.rs.selected_file num_problems = selected_file.ust_service_check(self._cmd) # obtain list of currently active services @@ -802,13 +807,6 @@ """Deactivate a service within EF.UST""" self._cmd.card.update_est(int(arg), 0) - def do_est_service_check(self, arg): - """Check consistency between services of this file and files present/activated""" - # obtain list of currently active services - (service_data, sw) = self._cmd.rs.read_binary_dec() - active_services = service_data.keys() - - # TS 31.102 Section 4.2.48 class EF_ACL(TransparentEF): def __init__(self, fid='6f57', sfid=None, name='EF.ACL', size={32, None}, diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py index f04f480..66124a8 100644 --- a/pySim/ts_31_103.py +++ b/pySim/ts_31_103.py @@ -125,9 +125,16 @@ self._cmd.card.update_ist(int(arg), 0) def do_ist_service_check(self, arg): - """Check consistency between services of this file and files present/activated""" + """Check consistency between services of this file and files present/activated. + + Many services determine if one or multiple files shall be present/activated or if they shall be + absent/deactivated. This performs a consistency check to ensure that no services are activated + for files that are not - and vice-versa, no files are activated for services that are not. Error + messages are printed for every inconsistency found.""" selected_file = self._cmd.rs.selected_file - selected_file.ust_service_check(self._cmd) + num_problems = selected_file.ust_service_check(self._cmd) + self._cmd.poutput("===> %u service / file inconsistencies detected" % num_problems) + # TS 31.103 Section 4.2.8 class EF_PCSCF(LinFixedEF): 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I18093d795721f2e729eff858c8922edde9e84451 Gerrit-Change-Number: 27182 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in pysim[master]: filesystem: Fix CardMF.get_app_names()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27177 ) Change subject: filesystem: Fix CardMF.get_app_names() ...................................................................... filesystem: Fix CardMF.get_app_names() This function was not used and doesn't work without this patch. Change-Id: Id3dad7d97fe29a25792d2f8f0e879666c1d9c136 --- M pySim/filesystem.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim/filesystem.py b/pySim/filesystem.py index d52a16e..95f792a 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -384,7 +384,7 @@ def get_app_names(self): """Get list of completions (AID names)""" - return [x.name for x in self.applications] + return list(self.applications.values()) def get_selectables(self, flags=[]) -> dict: """Return a dict of {'identifier': File} that is selectable from the current DF. 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id3dad7d97fe29a25792d2f8f0e879666c1d9c136 Gerrit-Change-Number: 27177 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in pysim[master]: ts_31_102: Add more EF.UST checks to 'ust_service_check' command

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27178 ) Change subject: ts_31_102: Add more EF.UST checks to 'ust_service_check' command ...................................................................... ts_31_102: Add more EF.UST checks to 'ust_service_check' command * check for service dependencies listed in TS 31.102 * print number of errors encountered Change-Id: Id47f8f2c8de299bbf91243d0c8900d22a7d35b10 --- M pySim/ts_31_102.py 1 file changed, 30 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 8e2d1c8..ce32b20 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -585,14 +585,20 @@ out[byte_offset] |= (bit) << bit_offset return out - def ust_service_check(self, cmd): - """Check consistency between services of this file and files present/activated""" + def get_active_services(self, cmd): # obtain list of currently active services (service_data, sw) = cmd.rs.read_binary_dec() active_services = [] for s in service_data.keys(): if service_data[s]['activated']: active_services.append(s) + return active_services + + def ust_service_check(self, cmd): + """Check consistency between services of this file and files present/activated""" + num_problems = 0 + # obtain list of currently active services + active_services = self.get_active_services(cmd) # iterate over all the service-constraints we know of files_by_service = self.parent.files_by_service try: @@ -612,6 +618,7 @@ sw = str(e) exists = False if exists != should_exist: + num_problems += 1 if exists: cmd.poutput(" ERROR: File %s is selectable but should not!" % f) else: @@ -619,6 +626,7 @@ finally: # re-select the EF.UST cmd.card._scc.select_file(self.fid) + return num_problems class EF_UST(EF_UServiceTable): def __init__(self, **kwargs): @@ -642,7 +650,26 @@ def do_ust_service_check(self, arg): """Check consistency between services of this file and files present/activated""" selected_file = self._cmd.rs.selected_file - selected_file.ust_service_check(self._cmd) + num_problems = selected_file.ust_service_check(self._cmd) + # obtain list of currently active services + active_services = selected_file.get_active_services(self._cmd) + # Service n°46 can only be declared "available" if service n°45 is declared "available" + if 46 in active_services and not 45 in active_services: + self._cmd.poutput("ERROR: Service 46 available, but it requires Service 45") + num_problems += 1 + # Service n°125 shall only be taken into account if Service n°124 is declared "available" + if 125 in active_services and not 124 in active_services: + self._cmd.poutput("ERROR: Service 125 is ignored as Service 124 not available") + num_problems += 1 + # Service n°95, n°99 and n°115 shall not be declared "available" if an ISIM application is present on the UICC + non_isim_services = [95, 99, 115] + app_names = selected_file.get_mf().get_app_names() + if 'ADF.ISIM' in app_names: + for s in non_isim_services: + if s in active_services: + self._cmd.poutput("ERROR: Service %u shall not be available as ISIM application is present" % s) + num_problems += 1 + self._cmd.poutput("===> %u service / file inconsistencies detected" % num_problems) # TS 31.103 Section 4.2.7 - *not* the same as DF.GSM/EF.ECC! -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id47f8f2c8de299bbf91243d0c8900d22a7d35b10 Gerrit-Change-Number: 27178 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2022