August 2024 - gerrit-log - lists.osmocom.org

[XS] Change in pysim[master]: pySim.ts_102_221: Make sure FileDescriptor for BER-TLV contains file_...
by laforge 17 Aug '24

17 Aug '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/37815?usp=email ) Change subject: pySim.ts_102_221: Make sure FileDescriptor for BER-TLV contains file_type ...................................................................... pySim.ts_102_221: Make sure FileDescriptor for BER-TLV contains file_type before this change, structure == 'ber_tlv' was missing the file_type == working_ef attribute. So for linear_fixed, transparent and cyclic, the file_type attribute was present, but for ber_tlv it was missing. This is illogical from a user point of vie and makes downstream code potentially more complex, as it cannot match on working_ef for all EF types. Change-Id: If0076cc6dd35a818c08309885f6ef1c1704052c6 --- M pySim/ts_102_221.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index c326ad1..9e0db68 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -19,7 +19,7 @@ from bidict import bidict from construct import Select, Const, Bit, Struct, Int16ub, FlagsEnum, GreedyString, ValidationError -from construct import Optional as COptional +from construct import Optional as COptional, Computed from pySim.construct import * from pySim.utils import * @@ -95,7 +95,7 @@ # ETSI TS 102 221 11.1.1.4.3 class FileDescriptor(BER_TLV_IE, tag=0x82): _test_de_encode = [ - ( '82027921', { "file_descriptor_byte": { "shareable": True, "structure": "ber_tlv" }, "record_len": None, "num_of_rec": None } ), + ( '82027921', { "file_descriptor_byte": { "shareable": True, "file_type": "working_ef", "structure": "ber_tlv" }, "record_len": None, "num_of_rec": None } ), ( '82027821', { "file_descriptor_byte": { "shareable": True, "file_type": "df", "structure": "no_info_given" }, "record_len": None, "num_of_rec": None }), ( '82024121', { "file_descriptor_byte": { "shareable": True, "file_type": "working_ef", "structure": "transparent" }, "record_len": None, "num_of_rec": None } ), ( '82054221006e05', { "file_descriptor_byte": { "shareable": True, "file_type": "working_ef", "structure": "linear_fixed" }, "record_len": 110, "num_of_rec": 5 } ), @@ -110,7 +110,7 @@ return 0x39 raise ValidationError - FDB = Select(BitStruct(Const(0, Bit), 'shareable'/Flag, 'structure'/BerTlvAdapter(Const(0x39, BitsInteger(6)))), + FDB = Select(BitStruct(Const(0, Bit), 'shareable'/Flag, 'structure'/BerTlvAdapter(Const(0x39, BitsInteger(6))), 'file_type'/Computed('working_ef')), BitStruct(Const(0, Bit), 'shareable'/Flag, 'file_type'/Enum(BitsInteger(3), working_ef=0, internal_ef=1, df=7), 'structure'/Enum(BitsInteger(3), no_info_given=0, transparent=1, linear_fixed=2, cyclic=6)) ) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37815?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If0076cc6dd35a818c08309885f6ef1c1704052c6 Gerrit-Change-Number: 37815 Gerrit-PatchSet: 2 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>

1 0

[XS] Change in pysim[master]: pySim.filesystem: Permit Path object construction from FID integer list
by laforge 17 Aug '24

17 Aug '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/37832?usp=email ) Change subject: pySim.filesystem: Permit Path object construction from FID integer list ...................................................................... pySim.filesystem: Permit Path object construction from FID integer list we so far supported construction of the Path object from a string or a list of strings. Let's also add the option of constructing it from a path consisting of a list of integer FID values. Change-Id: Ia7e9375b3258d1fbfdc892cefba3e3bbe841c550 --- M pySim/filesystem.py 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 624619b..805983b 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -1481,10 +1481,12 @@ class Path: """Representation of a file-system path.""" - def __init__(self, p: Union[str, List[str]]): + def __init__(self, p: Union[str, List[str], List[int]]): # split if given as single string with slahes if isinstance(p, str): p = p.split('/') + elif len(p) and isinstance(p[0], int): + p = ['%04x' % x for x in p] # make sure internal representation alwas is uppercase only self.list = [x.upper() for x in p] @@ -1514,7 +1516,7 @@ def relative_to_mf(self) -> 'Path': """Return a path relative to MF, i.e. without initial explicit MF.""" - if self.list[0] == 'MF': + if len(self.list) and self.list[0] in ['MF', '3F00']: return Path(self.list[1:]) return self -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37832?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia7e9375b3258d1fbfdc892cefba3e3bbe841c550 Gerrit-Change-Number: 37832 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[M] Change in pysim[master]: pySim.esim.saip.templates: Introduce dependency/hierarchy information
by laforge 17 Aug '24

17 Aug '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/37814?usp=email ) Change subject: pySim.esim.saip.templates: Introduce dependency/hierarchy information ...................................................................... pySim.esim.saip.templates: Introduce dependency/hierarchy information The SAIP specification is very weird in a way that it treats the DF and EF descriptions as some kind of flat structure without describing the hierarchy. So when creating a DF, sometimes it should be created below the current DF, and sometimes it should be adjacent next to the current DF. Let's introduce * a 'ppath' property of FileTemplate to indicate if a file is anything but a direct sibling of the 'base DF' of the PE * an 'extends' property of ProfileTemplate to indicate that a given template does not have its own 'base DF', but that its contents merely extends that of another ProfileTemplate * a 'parent' property of ProfileTemplate to indicate a parent ProfileTemplate below whose 'base DF' our files should be placed. Change-Id: Ieab4835cd21008b289713784c0eb7170af2ccfb9 --- M pySim/esim/saip/templates.py 1 file changed, 99 insertions(+), 50 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/esim/saip/templates.py b/pySim/esim/saip/templates.py index eff28c2..04b2cd4 100644 --- a/pySim/esim/saip/templates.py +++ b/pySim/esim/saip/templates.py @@ -22,11 +22,31 @@ import pySim.esim.saip.oid as OID class FileTemplate: - """Representation of a single file in a SimAlliance/TCA Profile Template.""" + """Representation of a single file in a SimAlliance/TCA Profile Template. The argument order + is done to match that of the tables in Section 9 of the SAIP specification.""" def __init__(self, fid:int, name:str, ftype, nb_rec: Optional[int], size:Optional[int], arr:int, sfi:Optional[int] = None, default_val:Optional[str] = None, content_rqd:bool = True, params:Optional[List] = None, ass_serv:Optional[List[int]]=None, high_update:bool = False, - pe_name:Optional[str] = None, repeat:bool = False): + pe_name:Optional[str] = None, repeat:bool = False, ppath: List[int] = []): + """ + Args: + fid: The 16bit file-identifier of the file + name: The name of the file in human-readable "EF.FOO", "DF.BAR" notation + ftype: The type of the file; can be 'MF', 'ADF', 'DF', 'TR', 'LF', 'CY', 'BT' + nb_rec: Then number of records (only valid for 'LF' and 'CY') + size: The size of the file ('TR', 'BT'); size of each record ('LF, 'CY') + arr: The record number of EF.ARR for referenced access rules + sfi: The short file identifier, if any + default_val: The default value [pattern] of the file + content_rqd: Whether an instance of template *must* specify file contents + params: A list of parameters that an instance of the template *must* specify + ass_serv: The associated service[s] of the service table + high_update: Is this file of "high update frequency" type? + pe_name: The name of this file in the ASN.1 type of the PE. Auto-generated for most. + repeat: Whether the default_val pattern is a repeating pattern. + ppath: The intermediate path between the base_df of the ProfileTemplate and this file. If not + specified, the file will be created immediately underneath the base_df. + """ # initialize from arguments self.fid = fid self.name = name @@ -48,6 +68,7 @@ self.params = params self.ass_serv = ass_serv self.high_update = high_update + self.ppath = ppath # parent path, if this FileTemplate is not immediately below the base_df # initialize empty self.parent = None self.children = [] @@ -63,8 +84,7 @@ s_fid = "%04x" % self.fid if self.fid is not None else 'None' s_arr = self.arr if self.arr is not None else 'None' s_sfi = "%02x" % self.sfi if self.sfi is not None else 'None' - return "FileTemplate(%s/%s, %s, %s, arr=%s, sfi=%s)" % (self.name, self.pe_name, s_fid, - self.file_type, s_arr, s_sfi) + return "FileTemplate(%s/%s, %s, %s, arr=%s, sfi=%s, ppath=%s)" % (self.name, self.pe_name, s_fid, self.file_type, s_arr, s_sfi, self.ppath) def print_tree(self, indent:str = ""): """recursive printing of FileTemplate tree structure.""" @@ -126,6 +146,13 @@ oid: Optional[OID.eOID] = None files: List[FileTemplate] = [] + # indicates that a given template does not have its own 'base DF', but that its contents merely + # extends that of the 'base DF' of another template + extends: Optional['ProfileTemplate'] = None + + # indicates a parent ProfileTemplate below whose 'base DF' our files should be placed. + parent: Optional['ProfileTemplate'] = None + def __init_subclass__(cls, **kwargs): """This classmethod is called automatically after executing the subclass body. We use it to initialize the cls.files_by_pename from the cls.files""" @@ -165,6 +192,14 @@ for c in cls.tree: c.print_tree() + @classmethod + def base_df(cls) -> FileTemplate: + """Return the FileTemplate for the base DF of the given template. This may be a DF or ADF + within this template, or refer to another template (e.g. mandatory USIM if we are optional USIM.""" + if cls.extends: + return cls.extends.base_df + return cls.files[0] + class ProfileTemplateRegistry: """A registry of profile templates. Exists as a singleton class with no instances and only classmethods.""" @@ -218,39 +253,39 @@ # Section 9.4: Do this separately, so we can use them also from 9.5.3 df_pb_files = [ FileTemplate(0x5f3a, 'DF.PHONEBOOK', 'DF', None, None, 14, None, None, True, ['pinStatusTemplateDO']), - FileTemplate(0x4f30, 'EF.PBR', 'LF', None, None, 2, None, None, True, ['nb_rec', 'size']), + FileTemplate(0x4f30, 'EF.PBR', 'LF', None, None, 2, None, None, True, ['nb_rec', 'size'], ppath=[0x5f3a]), ] for i in range(0x38, 0x40): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.EXT1', 'LF', None, 13, 5, None, '00FF...FF', False, ['size','sfi'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.EXT1', 'LF', None, 13, 5, None, '00FF...FF', False, ['size','sfi'], ppath=[0x5f3a])) for i in range(0x40, 0x48): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.AAS', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.AAS', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size'], ppath=[0x5f3a])) for i in range(0x48, 0x50): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.GAS', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.GAS', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size'], ppath=[0x5f3a])) df_pb_files += [ - FileTemplate(0x4f22, 'EF.PSC', 'TR', None, 4, 5, None, '00000000', False, ['sfi']), - FileTemplate(0x4f23, 'EF.CC', 'TR', None, 2, 5, None, '0000', False, ['sfi'], high_update=True), - FileTemplate(0x4f24, 'EF.PUID', 'TR', None, 2, 5, None, '0000', False, ['sfi'], high_update=True), + FileTemplate(0x4f22, 'EF.PSC', 'TR', None, 4, 5, None, '00000000', False, ['sfi'], ppath=[0x5f3a]), + FileTemplate(0x4f23, 'EF.CC', 'TR', None, 2, 5, None, '0000', False, ['sfi'], high_update=True, ppath=[0x5f3a]), + FileTemplate(0x4f24, 'EF.PUID', 'TR', None, 2, 5, None, '0000', False, ['sfi'], high_update=True, ppath=[0x5f3a]), ] for i in range(0x50, 0x58): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.IAP', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size','sfi'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.IAP', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size','sfi'], ppath=[0x5f3a])) for i in range(0x58, 0x60): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.ADN', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size','sfi'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.ADN', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size','sfi'], ppath=[0x5f3a])) for i in range(0x60, 0x68): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.ADN', 'LF', None, 2, 5, None, '00...00', False, ['nb_rec','sfi'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.ADN', 'LF', None, 2, 5, None, '00...00', False, ['nb_rec','sfi'], ppath=[0x5f3a])) for i in range(0x68, 0x70): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.ANR', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size','sfi'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.ANR', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size','sfi'], ppath=[0x5f3a])) for i in range(0x70, 0x78): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.PURI', 'LF', None, None, 5, None, None, True, ['nb_rec','size','sfi'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.PURI', 'LF', None, None, 5, None, None, True, ['nb_rec','size','sfi'], ppath=[0x5f3a])) for i in range(0x78, 0x80): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.EMAIL', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size','sfi'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.EMAIL', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size','sfi'], ppath=[0x5f3a])) for i in range(0x80, 0x88): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.SNE', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size','sfi'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.SNE', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size','sfi'], ppath=[0x5f3a])) for i in range(0x88, 0x90): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.UID', 'LF', None, 2, 5, None, '0000', False, ['nb_rec','sfi'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.UID', 'LF', None, 2, 5, None, '0000', False, ['nb_rec','sfi'], ppath=[0x5f3a])) for i in range(0x90, 0x98): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.GRP', 'LF', None, None, 5, None, '00...00', False, ['nb_rec','size','sfi'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.GRP', 'LF', None, None, 5, None, '00...00', False, ['nb_rec','size','sfi'], ppath=[0x5f3a])) for i in range(0x98, 0xa0): - df_pb_files.append(FileTemplate(0x4f00+i, 'EF.CCP1', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size','sfi'])) + df_pb_files.append(FileTemplate(0x4f00+i, 'EF.CCP1', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size','sfi'], ppath=[0x5f3a])) # Section 9.4 v2.3.1 class FilesTelecom(ProfileTemplate): @@ -266,29 +301,30 @@ FileTemplate(0x6fe1, 'EF.ICE_FF', 'LF', None, None, 9, None, 'FF...FF', False, ['nb_rec', 'size']), FileTemplate(0x6fe5, 'EF.PSISMSC', 'LF', None, None, 5, None, None, True, ['nb_rec', 'size'], ass_serv=[12,91]), FileTemplate(0x5f50, 'DF.GRAPHICS', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO']), - FileTemplate(0x4f20, 'EF.IMG', 'LF', None, None, 2, None, '00FF...FF', False, ['nb_rec', 'size']), + FileTemplate(0x4f20, 'EF.IMG', 'LF', None, None, 2, None, '00FF...FF', False, ['nb_rec', 'size'], ppath=[0x5f50]), # EF.IIDF below - FileTemplate(0x4f21, 'EF.ICE_GRAPHICS','BT',None,None, 9, None, None, False, ['size']), - FileTemplate(0x4f01, 'EF.LAUNCH_SCWS','TR',None, None, 10, None, None, True, ['size']), + FileTemplate(0x4f21, 'EF.ICE_GRAPHICS','BT',None,None, 9, None, None, False, ['size'], ppath=[0x5f50]), + FileTemplate(0x4f01, 'EF.LAUNCH_SCWS','TR',None, None, 10, None, None, True, ['size'], ppath=[0x5f50]), # EF.ICON below ] for i in range(0x40, 0x80): - files.append(FileTemplate(0x4f00+i, 'EF.IIDF', 'TR', None, None, 2, None, 'FF...FF', False, ['size'])) + files.append(FileTemplate(0x4f00+i, 'EF.IIDF', 'TR', None, None, 2, None, 'FF...FF', False, ['size'], ppath=[0x5f50])) for i in range(0x80, 0xC0): - files.append(FileTemplate(0x4f00+i, 'EF.ICON', 'TR', None, None, 10, None, None, True, ['size'])) + files.append(FileTemplate(0x4f00+i, 'EF.ICON', 'TR', None, None, 10, None, None, True, ['size'], ppath=[0x5f50])) # we copy the objects (instances) here as we also use them below from FilesUsimDfPhonebook - files += [deepcopy(x) for x in df_pb_files] + df_pb = deepcopy(df_pb_files) + files += df_pb files += [ FileTemplate(0x5f3b, 'DF.MULTIMEDIA','DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[67]), - FileTemplate(0x4f47, 'EF.MML', 'BT', None, None, 5, None, None, False, ['size'], ass_serv=[67]), - FileTemplate(0x4f48, 'EF.MMDF', 'BT', None, None, 5, None, None, False, ['size'], ass_serv=[67]), + FileTemplate(0x4f47, 'EF.MML', 'BT', None, None, 5, None, None, False, ['size'], ass_serv=[67], ppath=[0x5f3b]), + FileTemplate(0x4f48, 'EF.MMDF', 'BT', None, None, 5, None, None, False, ['size'], ass_serv=[67], ppath=[0x5f3b]), FileTemplate(0x5f3c, 'DF.MMSS', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO']), - FileTemplate(0x4f20, 'EF.MLPL', 'TR', None, None, 2, 0x01, None, True, ['size']), - FileTemplate(0x4f21, 'EF.MSPL', 'TR', None, None, 2, 0x02, None, True, ['size']), - FileTemplate(0x4f21, 'EF.MMSSMODE', 'TR', None, 1, 2, 0x03, None, True), + FileTemplate(0x4f20, 'EF.MLPL', 'TR', None, None, 2, 0x01, None, True, ['size'], ppath=[0x5f3c]), + FileTemplate(0x4f21, 'EF.MSPL', 'TR', None, None, 2, 0x02, None, True, ['size'], ppath=[0x5f3c]), + FileTemplate(0x4f21, 'EF.MMSSMODE', 'TR', None, 1, 2, 0x03, None, True, ppath=[0x5f3c]), ] @@ -306,40 +342,40 @@ FileTemplate(0x6fe1, 'EF.ICE_FF', 'LF', None, None, 9, None, 'FF...FF', False, ['nb_rec', 'size']), FileTemplate(0x6fe5, 'EF.PSISMSC', 'LF', None, None, 5, None, None, True, ['nb_rec', 'size'], ass_serv=[12,91]), FileTemplate(0x5f50, 'DF.GRAPHICS', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO']), - FileTemplate(0x4f20, 'EF.IMG', 'LF', None, None, 2, None, '00FF...FF', False, ['nb_rec', 'size']), + FileTemplate(0x4f20, 'EF.IMG', 'LF', None, None, 2, None, '00FF...FF', False, ['nb_rec', 'size'], ppath=[0x5f50]), # EF.IIDF below - FileTemplate(0x4f21, 'EF.ICE_GRRAPHICS','BT',None,None, 9, None, None, False, ['size']), - FileTemplate(0x4f01, 'EF.LAUNCH_SCWS','TR',None, None, 10, None, None, True, ['size']), + FileTemplate(0x4f21, 'EF.ICE_GRRAPHICS','BT',None,None, 9, None, None, False, ['size'], ppath=[0x5f50]), + FileTemplate(0x4f01, 'EF.LAUNCH_SCWS','TR',None, None, 10, None, None, True, ['size'], ppath=[0x5f50]), # EF.ICON below ] for i in range(0x40, 0x80): - files.append(FileTemplate(0x4f00+i, 'EF.IIDF', 'TR', None, None, 2, None, 'FF...FF', False, ['size'])) + files.append(FileTemplate(0x4f00+i, 'EF.IIDF', 'TR', None, None, 2, None, 'FF...FF', False, ['size'], ppath=[0x5f50])) for i in range(0x80, 0xC0): - files.append(FileTemplate(0x4f00+i, 'EF.ICON', 'TR', None, None, 10, None, None, True, ['size'])) + files.append(FileTemplate(0x4f00+i, 'EF.ICON', 'TR', None, None, 10, None, None, True, ['size'],ppath=[0x5f50])) # we copy the objects (instances) here as we also use them below from FilesUsimDfPhonebook - files += [deepcopy(x) for x in df_pb_files] + df_pb = deepcopy(df_pb_files) + files += df_pb files += [ FileTemplate(0x5f3b, 'DF.MULTIMEDIA','DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[67]), - FileTemplate(0x4f47, 'EF.MML', 'BT', None, None, 5, None, None, False, ['size'], ass_serv=[67]), - FileTemplate(0x4f48, 'EF.MMDF', 'BT', None, None, 5, None, None, False, ['size'], ass_serv=[67]), + FileTemplate(0x4f47, 'EF.MML', 'BT', None, None, 5, None, None, False, ['size'], ass_serv=[67], ppath=[0x5f3b]), + FileTemplate(0x4f48, 'EF.MMDF', 'BT', None, None, 5, None, None, False, ['size'], ass_serv=[67], ppath=[0x5f3b]), FileTemplate(0x5f3c, 'DF.MMSS', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO']), - FileTemplate(0x4f20, 'EF.MLPL', 'TR', None, None, 2, 0x01, None, True, ['size']), - FileTemplate(0x4f21, 'EF.MSPL', 'TR', None, None, 2, 0x02, None, True, ['size']), - FileTemplate(0x4f21, 'EF.MMSSMODE', 'TR', None, 1, 2, 0x03, None, True), - + FileTemplate(0x4f20, 'EF.MLPL', 'TR', None, None, 2, 0x01, None, True, ['size'], ppath=[0x5f3c]), + FileTemplate(0x4f21, 'EF.MSPL', 'TR', None, None, 2, 0x02, None, True, ['size'], ppath=[0x5f3c]), + FileTemplate(0x4f21, 'EF.MMSSMODE', 'TR', None, 1, 2, 0x03, None, True, ppath=[0x5f3c]), FileTemplate(0x5f3d, 'DF.MCS', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv={'usim':109, 'isim': 15}), - FileTemplate(0x4f01, 'EF.MST', 'TR', None, None, 2, 0x01, None, True, ['size'], ass_serv={'usim':109, 'isim': 15}), - FileTemplate(0x4f02, 'EF.MCSCONFIG', 'BT', None, None, 2, 0x02, None, True, ['size'], ass_serv={'usim':109, 'isim': 15}), + FileTemplate(0x4f01, 'EF.MST', 'TR', None, None, 2, 0x01, None, True, ['size'], ass_serv={'usim':109, 'isim': 15}, ppath=[0x5f3d]), + FileTemplate(0x4f02, 'EF.MCSCONFIG', 'BT', None, None, 2, 0x02, None, True, ['size'], ass_serv={'usim':109, 'isim': 15}, ppath=[0x5f3d]), FileTemplate(0x5f3e, 'DF.V2X', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[119]), - FileTemplate(0x4f01, 'EF.VST', 'TR', None, None, 2, 0x01, None, True, ['size'], ass_serv=[119]), - FileTemplate(0x4f02, 'EF.V2X_CONFIG','BT', None, None, 2, 0x02, None, True, ['size'], ass_serv=[119]), - FileTemplate(0x4f03, 'EF.V2XP_PC5', 'TR', None, None, 2, None, None, True, ['size'], ass_serv=[119]), # VST: 2 - FileTemplate(0x4f04, 'EF.V2XP_Uu', 'TR', None, None, 2, None, None, True, ['size'], ass_serv=[119]), # VST: 3 + FileTemplate(0x4f01, 'EF.VST', 'TR', None, None, 2, 0x01, None, True, ['size'], ass_serv=[119], ppath=[0x5f3e]), + FileTemplate(0x4f02, 'EF.V2X_CONFIG','BT', None, None, 2, 0x02, None, True, ['size'], ass_serv=[119], ppath=[0x5f3e]), + FileTemplate(0x4f03, 'EF.V2XP_PC5', 'TR', None, None, 2, None, None, True, ['size'], ass_serv=[119], ppath=[0x5f3e]), # VST: 2 + FileTemplate(0x4f04, 'EF.V2XP_Uu', 'TR', None, None, 2, None, None, True, ['size'], ass_serv=[119], ppath=[0x5f3e]), # VST: 3 ] @@ -412,6 +448,7 @@ optional = True oid = OID.ADF_USIMopt_not_by_default base_path = Path('ADF.USIM') + extends = FilesUsimMandatory files = [ FileTemplate(0x6f05, 'EF.LI', 'TR', None, 6, 1, 0x02, 'FF...FF', False), FileTemplate(0x6f37, 'EF.ACMmax', 'TR', None, 3, 5, None, '000000', False, ass_serv=[13], pe_name='ef-acmax'), @@ -496,6 +533,7 @@ optional = True oid = OID.ADF_USIMopt_not_by_default_v2 base_path = Path('ADF.USIM') + extends = FilesUsimMandatoryV2 files = [ FileTemplate(0x6f05, 'EF.LI', 'TR', None, 6, 1, 0x02, 'FF...FF', False), FileTemplate(0x6f37, 'EF.ACMmax', 'TR', None, 3, 5, None, '000000', False, ass_serv=[13]), @@ -590,6 +628,7 @@ optional = True oid = OID.ADF_USIMopt_not_by_default_v3 base_path = Path('ADF.USIM') + extends = FilesUsimMandatoryV2 files = FilesUsimOptionalV2.files + [ FileTemplate(0x6f01, 'EF.eAKA', 'TR', None, 1, 3, None, None, True, ['size'], ass_serv=[134]), ] @@ -607,6 +646,7 @@ created_by_default = False oid = OID.DF_GSM_ACCESS_ADF_USIM base_path = Path('ADF.USIM') + parent = FilesUsimMandatory files = [ FileTemplate(0x5f3b, 'DF.GSM-ACCESS','DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[27]), FileTemplate(0x4f20, 'EF.Kc', 'TR', None, 9, 5, 0x01, 'FF...FF07', False, ass_serv=[27], high_update=True), @@ -621,6 +661,7 @@ created_by_default = False oid = OID.DF_5GS base_path = Path('ADF.USIM') + parent = FilesUsimMandatory files = [ FileTemplate(0x6fc0, 'DF.5GS', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[122,126,127,128,129,130], pe_name='df-df-5gs'), FileTemplate(0x4f01, 'EF.5GS3GPPLOCI', 'TR', None, 20, 5, 0x01, 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000001', False, ass_serv=[122], high_update=True), @@ -641,6 +682,7 @@ created_by_default = False oid = OID.DF_5GS_v2 base_path = Path('ADF.USIM') + parent = FilesUsimMandatory files = [ FileTemplate(0x6fc0, 'DF.5GS', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[122,126,127,128,129,130], pe_name='df-df-5gs'), FileTemplate(0x4f01, 'EF.5GS3GPPLOCI', 'TR', None, 20, 5, 0x01, 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000001', False, ass_serv=[122], high_update=True), @@ -663,6 +705,7 @@ created_by_default = False oid = OID.DF_5GS_v3 base_path = Path('ADF.USIM') + parent = FilesUsimMandatory files = [ FileTemplate(0x6fc0, 'DF.5GS', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[122,126,127,128,129,130], pe_name='df-df-5gs'), FileTemplate(0x4f01, 'EF.5GS3GPPLOCI', 'TR', None, 20, 5, 0x01, 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000001', False, ass_serv=[122], high_update=True), @@ -686,6 +729,7 @@ created_by_default = False oid = OID.DF_5GS_v4 base_path = Path('ADF.USIM') + parent = FilesUsimMandatory files = [ FileTemplate(0x6fc0, 'DF.5GS', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[122,126,127,128,129,130], pe_name='df-df-5gs'), FileTemplate(0x4f01, 'EF.5GS3GPPLOCI', 'TR', None, 20, 5, 0x01, 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000001', False, ass_serv=[122], high_update=True), @@ -717,6 +761,7 @@ created_by_default = False oid = OID.DF_SAIP base_path = Path('ADF.USIM') + parent = FilesUsimMandatory files = [ FileTemplate(0x6fd0, 'DF.SAIP', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[(124, 125)], pe_name='df-df-saip'), FileTemplate(0x4f01, 'EF.SUCICalcInfo','TR', None, None, 3, None, 'FF...FF', False, ['size'], ass_serv=[125], pe_name='ef-suci-calc-info-usim'), @@ -727,6 +772,7 @@ created_by_default = False oid = OID.DF_SNPN base_path = Path('ADF.USIM') + parent = FilesUsimMandatory files = [ FileTemplate(0x5fe0, 'DF.SNPN', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[143], pe_name='df-df-snpn'), FileTemplate(0x4f01, 'EF.PWS_SNPN', 'TR', None, 1, 10, None, None, True, ass_serv=[143]), @@ -737,6 +783,7 @@ created_by_default = False oid = OID.DF_5GProSe base_path = Path('ADF.USIM') + parent = FilesUsimMandatory files = [ FileTemplate(0x5ff0, 'DF.5G_ProSe', 'DF', None, None, 14, None, None, False, ['pinStatusTeimplateDO'], ass_serv=[139], pe_name='df-df-5g-prose'), FileTemplate(0x4f01, 'EF.5G_PROSE_ST', 'TR', None, 1, 2, 0x01, None, True, ass_serv=[139]), @@ -768,6 +815,7 @@ optional = True oid = OID.ADF_ISIMopt_not_by_default base_path = Path('ADF.ISIM') + extends = FilesIsimMandatory files = [ FileTemplate(0x6f09, 'EF.P-CSCF', 'LF', 1, None, 2, None, None, True, ['size'], ass_serv=[1,5]), FileTemplate(0x6f3c, 'EF.SMS', 'LF', 10, 176, 5, None, '00FF...FF', False, ass_serv=[6,8]), @@ -787,6 +835,7 @@ optional = True oid = OID.ADF_ISIMopt_not_by_default_v2 base_path = Path('ADF.ISIM') + extends = FilesIsimMandatory files = [ FileTemplate(0x6f09, 'EF.PCSCF', 'LF', 1, None, 2, None, None, True, ['size'], ass_serv=[1,5]), FileTemplate(0x6f3c, 'EF.SMS', 'LF', 10, 176, 5, None, '00FF...FF', False, ass_serv=[6,8]), -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37814?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ieab4835cd21008b289713784c0eb7170af2ccfb9 Gerrit-Change-Number: 37814 Gerrit-PatchSet: 2 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>

1 0

[XS] Change in pysim[master]: saip-tool: Set default log level to INFO (instead of DEBUG)
by laforge 17 Aug '24

17 Aug '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/37833?usp=email ) Change subject: saip-tool: Set default log level to INFO (instead of DEBUG) ...................................................................... saip-tool: Set default log level to INFO (instead of DEBUG) most users don't want to debug the program. Change-Id: I54ae558cf8d87bf64cc75431cc4edcc694fa9084 --- M contrib/saip-tool.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/saip-tool.py b/contrib/saip-tool.py index d9d33c0..22b913e 100755 --- a/contrib/saip-tool.py +++ b/contrib/saip-tool.py @@ -31,7 +31,7 @@ pp = HexBytesPrettyPrinter(indent=4,width=500) -logging.basicConfig(level=logging.DEBUG) +logging.basicConfig(level=logging.INFO) parser = argparse.ArgumentParser(description=""" Utility program to work with eSIM SAIP (SimAlliance Interoperable Profile) files.""") -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37833?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I54ae558cf8d87bf64cc75431cc4edcc694fa9084 Gerrit-Change-Number: 37833 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in pysim[master]: pySim.esim.saip.oid: Allow OID instance in prefix_match()
by laforge 17 Aug '24

17 Aug '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/37834?usp=email ) Change subject: pySim.esim.saip.oid: Allow OID instance in prefix_match() ...................................................................... pySim.esim.saip.oid: Allow OID instance in prefix_match() So far the prefix_match() required a string argument; let's also permit another OID object to be passed; we internally convert that to string. Change-Id: I0feb7782d1813cc46ec78f170eb0fce804aebe3a --- M pySim/esim/saip/oid.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/esim/saip/oid.py b/pySim/esim/saip/oid.py index f201ffe..02ef23b 100644 --- a/pySim/esim/saip/oid.py +++ b/pySim/esim/saip/oid.py @@ -77,9 +77,9 @@ if self.cmp(other) > 0: return True - def prefix_match(self, oid_str): + def prefix_match(self, oid_str: Union[str, 'OID']): """determine if oid_str is equal or below our OID.""" - return oid_str.startswith(str(self)) + return str(oid_str).startswith(str(self)) class eOID(OID): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37834?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0feb7782d1813cc46ec78f170eb0fce804aebe3a Gerrit-Change-Number: 37834 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in pysim[master]: pySim.ts_102_221: Make sure FileDescriptor for BER-TLV contains file_...
by laforge 17 Aug '24

17 Aug '24

Attention is currently required from: dexter, fixeria. laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/37815?usp=email ) Change subject: pySim.ts_102_221: Make sure FileDescriptor for BER-TLV contains file_type ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37815?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If0076cc6dd35a818c08309885f6ef1c1704052c6 Gerrit-Change-Number: 37815 Gerrit-PatchSet: 2 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 17 Aug 2024 05:17:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in pysim[master]: pySim.esim.saip.templates: Introduce dependency/hierarchy information
by laforge 17 Aug '24

17 Aug '24

Attention is currently required from: dexter, fixeria. laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/37814?usp=email ) Change subject: pySim.esim.saip.templates: Introduce dependency/hierarchy information ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37814?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ieab4835cd21008b289713784c0eb7170af2ccfb9 Gerrit-Change-Number: 37814 Gerrit-PatchSet: 2 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 17 Aug 2024 05:17:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[L] Change in osmo-upf[master]: add VTY 'gtp-echo' command
by laforge 17 Aug '24

17 Aug '24

Attention is currently required from: neels. laforge has posted comments on this change by neels. ( https://gerrit.osmocom.org/c/osmo-upf/+/37830?usp=email ) Change subject: add VTY 'gtp-echo' command ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/osmo-upf/upf_gtpu_echo.c: https://gerrit.osmocom.org/c/osmo-upf/+/37830/comment/bc291ff2_34eb2e44?usp… : PS1, Line 151: rc = sendto(dev->gtpv1.ofd.fd, msgbuf, GTP_ECHO_REQ_SIZE, 0, &remote->u.sa, sizeof(*remote)); this is introducing even more direct socket interaction without going through osmo_io. One can of course do that, but all of this code IMHO is lacking the use of abstractions. Why don't we have separate functions to encode/decode GTP-U packets, including the IEs? Why are we having low-level code to puzzle together a message header bit by bit and calling sendto in the same function? We're not using msgb, not osmo_io, and neither some kind of gtp-u custom abstraction. Yes, one can do all that, and it will work. but for osmo-*, it's unusual, IMHO. We usually build infrastructure/abstraction and then use that. -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/37830?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I970dccd7a27b098eea9e660822e24e2c4b059fc6 Gerrit-Change-Number: 37830 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Sat, 17 Aug 2024 05:16:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-upf[master]: upf gtp-u echo: rx Echo Response messages
by laforge 17 Aug '24

17 Aug '24

Attention is currently required from: neels. laforge has posted comments on this change by neels. ( https://gerrit.osmocom.org/c/osmo-upf/+/37829?usp=email ) Change subject: upf gtp-u echo: rx Echo Response messages ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/37829?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Idad417746a1ea797e8fbfe04ca9c84923a6118fa Gerrit-Change-Number: 37829 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Sat, 17 Aug 2024 05:12:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-upf[master]: upf gtp-u echo: improve loging
by laforge 17 Aug '24

17 Aug '24

Attention is currently required from: neels. laforge has posted comments on this change by neels. ( https://gerrit.osmocom.org/c/osmo-upf/+/37828?usp=email ) Change subject: upf gtp-u echo: improve loging ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/37828?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I3c7fe7c3eb1467ae34085da6bbf26a935a6c927b Gerrit-Change-Number: 37828 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Sat, 17 Aug 2024 05:12:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log August 2024