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

[S] Change in pysim[master]: pySim.esim.saip: More type annotations

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35735?usp=email ) Change subject: pySim.esim.saip: More type annotations ...................................................................... pySim.esim.saip: More type annotations Change-Id: Ib549817ee137bab610aea9c89a5ab86c2a7592ea --- M pySim/esim/saip/__init__.py 1 file changed, 20 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/35/35735/1 diff --git a/pySim/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 251395f..7bb2172 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -16,7 +16,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. import abc -from typing import Tuple, List, Optional, Dict +from typing import Tuple, List, Optional, Dict, Union import asn1tools @@ -26,7 +26,7 @@ asn1 = compile_asn1_subdir('saip') class ProfileElement: - def _fixup_sqnInit_dec(self): + def _fixup_sqnInit_dec(self) -> None: """asn1tools has a bug when working with SEQUENCE OF that have DEFAULT values. Let's work around this.""" if self.type != 'akaParameter': @@ -39,7 +39,7 @@ # SEQUENCE (SIZE (32)) OF OCTET STRING (SIZE (6)) self.decoded['sqnInit'] = [b'\x00'*6] * 32 - def _fixup_sqnInit_enc(self): + def _fixup_sqnInit_enc(self) -> None: """asn1tools has a bug when working with SEQUENCE OF that have DEFAULT values. Let's work around this.""" if self.type != 'akaParameter': @@ -53,7 +53,7 @@ # none of the fields were initialized with a non-default (non-zero) value, so we can skip it del self.decoded['sqnInit'] - def parse_der(self, der: bytes): + def parse_der(self, der: bytes) -> None: """Parse a sequence of PE and store the result in instance attributes.""" self.type, self.decoded = asn1.decode('ProfileElement', der) # work around asn1tools bug regarding DEFAULT for a SEQUENCE OF @@ -72,7 +72,7 @@ self._fixup_sqnInit_enc() return asn1.encode('ProfileElement', (self.type, self.decoded)) - def __str__(self): + def __str__(self) -> str: return self.type @@ -102,7 +102,7 @@ assert len(l) == 1 return l[0] - def parse_der(self, der: bytes): + def parse_der(self, der: bytes) -> None: """Parse a sequence of PE and store the result in self.pe_list.""" self.pe_list = [] remainder = der @@ -111,11 +111,11 @@ self.pe_list.append(ProfileElement.from_der(first_tlv)) self._process_pelist() - def _process_pelist(self): + def _process_pelist(self) -> None: self._rebuild_pe_by_type() self._rebuild_pes_by_naa() - def _rebuild_pe_by_type(self): + def _rebuild_pe_by_type(self) -> None: self.pe_by_type = {} # build a dict {pe_type: [pe, pe, pe]} for pe in self.pe_list: @@ -124,7 +124,7 @@ else: self.pe_by_type[pe.type] = [pe] - def _rebuild_pes_by_naa(self): + def _rebuild_pes_by_naa(self) -> None: """rebuild the self.pes_by_naa dict {naa: [ [pe, pe, pe], [pe, pe] ]} form, which basically means for every NAA there's a lsit of instances, and each consists of a list of a list of PEs.""" @@ -165,8 +165,8 @@ out += pe.to_der() return out - def __repr__(self): + def __repr__(self) -> str: return "PESequence(%s)" % ', '.join([str(x) for x in self.pe_list]) - def __iter__(self): + def __iter__(self) -> str: yield from self.pe_list -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35735?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib549817ee137bab610aea9c89a5ab86c2a7592ea Gerrit-Change-Number: 35735 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[L] Change in pysim[master]: add SAIP template handling + v3.1 definitions

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/35731?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: add SAIP template handling + v3.1 definitions ...................................................................... add SAIP template handling + v3.1 definitions This adds classes for describing profile templates as well as derived classes defining the profile templates of the "Profile Interoperability Technical Specification", specifically it's "ANNEX A (Normative): File Structure Templates Definition" We need a machine-readable definition of those templates, so we can fully interpret an unprotected profile package (UPP), as the UPP usually only contains the increment/difference to a given teplate. Change-Id: I79bc0a480450ca2de4b687ba6f11d0a4ea4f14c8 --- A pySim/esim/saip/templates.py 1 file changed, 694 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/31/35731/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35731?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I79bc0a480450ca2de4b687ba6f11d0a4ea4f14c8 Gerrit-Change-Number: 35731 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: saip.personalization: Fix ICCID fillFileContent replacement

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35730?usp=email ) Change subject: saip.personalization: Fix ICCID fillFileContent replacement ...................................................................... saip.personalization: Fix ICCID fillFileContent replacement Change-Id: Ic267fdde3b648b376ea6814783df1e90ea9bb9ad --- M pySim/esim/saip/personalization.py 1 file changed, 13 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/pySim/esim/saip/personalization.py b/pySim/esim/saip/personalization.py index bde7ce6..cb3edc1 100644 --- a/pySim/esim/saip/personalization.py +++ b/pySim/esim/saip/personalization.py @@ -26,7 +26,8 @@ def file_replace_content(file: List[Tuple], new_content: bytes): """Completely replace all fillFileContent of a decoded 'File' with the new_content.""" - file = remove_unwanted_tuples_from_list(file, ['fillFileContent', 'fillFileOffset']) + # use [:] to avoid making a copy, as we're doing in-place modification of the list here + file[:] = remove_unwanted_tuples_from_list(file, ['fillFileContent', 'fillFileOffset']) file.append(('fillFileContent', new_content)) return file @@ -54,9 +55,9 @@ name = 'iccid' def apply(self, pes: ProfileElementSequence): # patch the header; FIXME: swap nibbles! - pes.get_pe_by_type('header').decoded['iccid'] = self.value + pes.get_pe_for_type('header').decoded['iccid'] = self.value # patch MF/EF.ICCID - file_replace_content(pes.get_pe_by_type('mf').decoded['ef-iccid'], self.value) + file_replace_content(pes.get_pe_for_type('mf').decoded['ef-iccid'], bytes(self.value)) class Imsi(ConfigurableParameter): """Configurable IMSI. Expects value to be n EF.IMSI format.""" -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35730?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic267fdde3b648b376ea6814783df1e90ea9bb9ad Gerrit-Change-Number: 35730 Gerrit-PatchSet: 1 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 months, 1 week

1
0
0 0

[S] Change in pysim[master]: saip.personalization: Also drop any fillFileOffset

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35729?usp=email ) Change subject: saip.personalization: Also drop any fillFileOffset ...................................................................... saip.personalization: Also drop any fillFileOffset When replacing a file's contents, we must not just remove any fillFileContent tuples, but also the fillFileOffset. Change-Id: I3e4d97ae9de8a78f7bc0165ece5954481568b800 --- M pySim/esim/saip/personalization.py 1 file changed, 15 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/pySim/esim/saip/personalization.py b/pySim/esim/saip/personalization.py index 32a53e6..bde7ce6 100644 --- a/pySim/esim/saip/personalization.py +++ b/pySim/esim/saip/personalization.py @@ -20,13 +20,13 @@ from pySim.esim.saip import ProfileElement, ProfileElementSequence -def remove_unwanted_tuples_from_list(l: List[Tuple], unwanted_key:str) -> List[Tuple]: +def remove_unwanted_tuples_from_list(l: List[Tuple], unwanted_keys: List[str]) -> List[Tuple]: """In a list of tuples, remove all tuples whose first part equals 'unwanted_key'.""" - return list(filter(lambda x: x[0] != unwanted_key, l)) + return list(filter(lambda x: x[0] not in unwanted_keys, l)) def file_replace_content(file: List[Tuple], new_content: bytes): """Completely replace all fillFileContent of a decoded 'File' with the new_content.""" - file = remove_unwanted_tuples_from_list(file, 'fillFileContent') + file = remove_unwanted_tuples_from_list(file, ['fillFileContent', 'fillFileOffset']) file.append(('fillFileContent', new_content)) return file -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35729?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3e4d97ae9de8a78f7bc0165ece5954481568b800 Gerrit-Change-Number: 35729 Gerrit-PatchSet: 1 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 months, 1 week

1
0
0 0

[S] Change in pysim[master]: requirements.txt: Switch to osmocom fork of asn1tools

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35732?usp=email ) Change subject: requirements.txt: Switch to osmocom fork of asn1tools ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35732?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id28fcf060f491bb3d76aa6d8026aa76058edb675 Gerrit-Change-Number: 35732 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 29 Jan 2024 02:24:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[L] Change in pysim[master]: add SAIP template handling + v3.1 definitions

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35731?usp=email ) Change subject: add SAIP template handling + v3.1 definitions ...................................................................... Patch Set 1: (2 comments) File pySim/esim/saip/templates.py: https://gerrit.osmocom.org/c/pysim/+/35731/comment/6ad8d394_7faa632d PS1, Line 23: __init__ cosmetic: too many params, may of which are optional. I would go for `**kw` here: ``` def __init__(self, fid:int, name:str, ftype: str, **kw): # ... self.foo = kw.get('foo') # defaults to None self.bar = kw.get('bar', True) # defaults to True ``` https://gerrit.osmocom.org/c/pysim/+/35731/comment/f66bf293_989183cf PS1, Line 531: FilesUsimDf5GSv2 duplicate definition -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35731?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I79bc0a480450ca2de4b687ba6f11d0a4ea4f14c8 Gerrit-Change-Number: 35731 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 29 Jan 2024 02:24:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: saip.personalization: Fix ICCID fillFileContent replacement

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35730?usp=email ) Change subject: saip.personalization: Fix ICCID fillFileContent replacement ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35730?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic267fdde3b648b376ea6814783df1e90ea9bb9ad Gerrit-Change-Number: 35730 Gerrit-PatchSet: 1 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 29 Jan 2024 02:14:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: saip.personalization: Also drop any fillFileOffset

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35729?usp=email ) Change subject: saip.personalization: Also drop any fillFileOffset ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35729?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3e4d97ae9de8a78f7bc0165ece5954481568b800 Gerrit-Change-Number: 35729 Gerrit-PatchSet: 1 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 29 Jan 2024 02:13:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: requirements.txt: Switch to osmocom fork of asn1tools

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35732?usp=email ) Change subject: requirements.txt: Switch to osmocom fork of asn1tools ...................................................................... requirements.txt: Switch to osmocom fork of asn1tools This is sadly required as the Interoperable Profile format must process elements of an ASN.1 sequence in order, which doesn't work if the parser puts the elements in a python dict. The osmocom fork of asn1tools hence uses OrderedDict to work around this problem. Change-Id: Id28fcf060f491bb3d76aa6d8026aa76058edb675 --- M requirements.txt 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/32/35732/1 diff --git a/requirements.txt b/requirements.txt index 5b735f0..c12daf8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,6 +11,6 @@ colorlog pycryptodomex cryptography -asn1tools +git+https://github.com/osmocom/asn1tools packaging git+https://github.com/hologram-io/smpp.pdu -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35732?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id28fcf060f491bb3d76aa6d8026aa76058edb675 Gerrit-Change-Number: 35732 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[L] Change in pysim[master]: WIP: profile processing; merging with templates

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35733?usp=email ) Change subject: WIP: profile processing; merging with templates ...................................................................... WIP: profile processing; merging with templates Change-Id: Ib1674920e488ade9597cb039e4e2047dcbc7864e --- M pySim/esim/saip/__init__.py M pySim/esim/saip/validation.py A saip-test.py 3 files changed, 261 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/33/35733/1 diff --git a/pySim/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 9b182e5..d8bc4d7 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -16,12 +16,16 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. import abc +import io from typing import Tuple, List, Optional, Dict import asn1tools from pySim.utils import bertlv_parse_tag, bertlv_parse_len +from pySim.ts_102_221 import FileDescriptor +from pySim.construct import build_construct from pySim.esim import compile_asn1_subdir +import pySim.esim.saip.templates as templates asn1 = compile_asn1_subdir('saip') @@ -81,8 +85,104 @@ IoT_default = eOID("2.17") IoT_default = eOID("2.18") +class File: + """Internal representation of a file in a profile filesystem.""" + def __init__(self, pename: str, l: Optional[List[Tuple]] = None, template: Optional[templates.FileTemplate] = None): + self.pe_name = pename + self.template = template + self.fileDescriptor = {} + self.stream = None + # apply some defaults from profile + if self.template: + self.from_template(self.template) + print("after template: %s" % repr(self)) + if l: + self.from_tuples(l) + + def from_template(self, template: templates.FileTemplate): + """Determine defaults for file based on given FileTemplate.""" + fdb_dec = {} + self.rec_len = None + if template.fid: + self.fileDescriptor['fileID'] = template.fid.to_bytes(2, 'big') + if template.sfi: + self.fileDescriptor['shortEFID'] = bytes([template.sfi]) + if template.arr: + self.fileDescriptor['securityAttributesReferenced'] = bytes([template.arr]) + # All the files defined in the templates shall have, by default, shareable/not-shareable bit in the file descriptor set to "shareable". + fdb_dec['shareable'] = True + if template.file_type in ['LF', 'CY']: + fdb_dec['file_type'] = 'working_ef' + if template.rec_len: + self.record_len = template.rec_len + if template.nb_rec and template.rec_len: + self.fileDescriptor['efFileSize'] = (template.nb_rec * template.rec_len).to_bytes(2, 'big') # FIXME + if template.file_type == 'LF': + fdb_dec['structure'] = 'linear_fixed' + elif template.file_type == 'CY': + fdb_dec['structure'] = 'cyclic' + elif template.file_type in ['TR', 'BT']: + fdb_dec['file_type'] = 'working_ef' + if template.file_size: + self.fileDescriptor['efFileSize'] = template.file_size.to_bytes(2, 'big') # FIXME + if template.file_type == 'BT': + fdb_dec['structure'] = 'ber_tlv' + elif template.file_type == 'TR': + fdb_dec['structure'] = 'transparent' + elif template.file_type in ['MF', 'DF', 'ADF']: + fdb_dec['file_type'] = 'df' + fdb_dec['structure'] = 'no_info_given' + # build file descriptor based on above input data + fd_dict = {'file_descriptor_byte': fdb_dec} + if self.rec_len: + fd_dict['record_len'] = self.rec_len + self.fileDescriptor['fileDescriptor'] = build_construct(FileDescriptor._construct, fd_dict) + # FIXME: default_val + # FIXME: high_update + # FIXME: params? + + def from_tuples(self, l:List[Tuple]): + """Parse a list of fileDescriptor, fillFileContent, fillFileOffset tuples into this instance.""" + def get_fileDescriptor(l:List[Tuple]): + for k, v in l: + if k == 'fileDescriptor': + return v + fd = get_fileDescriptor(l) + if not fd: + raise ValueError("No fileDescriptor found") + self.fileDescriptor.update(dict(fd)) + self.stream = self.linearize_file_content(l) + + def to_tuples() -> List[Tuple]: + """Generate a list of fileDescriptor, fillFileContent, fillFileOffset tuples into this instance.""" + raise NotImplementedError + + @staticmethod + def linearize_file_content(l: List[Tuple]) -> Optional[io.BytesIO]: + """linearize a list of fillFileContent + fillFileOffset tuples.""" + stream = io.BytesIO() + for k, v in l: + if k == 'doNotCreate': + return None + if k == 'fileDescriptor': + pass + elif k == 'fillFileOffset': + stream.write(b'\xff' * v) + elif k == 'fillFileContent': + stream.write(v) + else: + return ValueError("Unknown key '%s' in tuple list" % k) + return stream + + def __str__(self) -> str: + return "File(%s)" % self.pe_name + + def __repr__(self) -> str: + return "File(%s): %s" % (self.pe_name, self.fileDescriptor) class ProfileElement: + FILE_BEARING = ['mf', 'cd', 'telecom', 'usim', 'opt-usim', 'isim', 'opt-isim', 'phonebook', 'gsm-access', + 'csim', 'opt-csim', 'eap', 'df-5gs', 'df-saip', 'df-snpn', 'df-5gprose', 'iot', 'opt-iot'] def _fixup_sqnInit_dec(self): """asn1tools has a bug when working with SEQUENCE OF that have DEFAULT values. Let's work around this.""" @@ -116,6 +216,29 @@ # work around asn1tools bug regarding DEFAULT for a SEQUENCE OF self._fixup_sqnInit_dec() + @property + def header_name(self) -> str: + # unneccessarry compliaction by inconsistent naming :( + if self.type.startswith('opt-'): + return self.type.replace('-','') + '-header' + else: + return self.type + '-header' + + @property + def header(self): + return self.decoded.get(self.header_name, None) + + @property + def templateID(self): + return self.decoded.get('templateID', None) + + @property + def files(self): + """Return dict of decoded 'File' ASN.1 items.""" + if not self.type in self.FILE_BEARING: + return {} + return {k:v for (k,v) in self.decoded.items() if k not in ['templateID', self.header_name]} + @classmethod def from_der(cls, der: bytes) -> 'ProfileElement': """Construct an instance from given raw, DER encoded bytes.""" diff --git a/pySim/esim/saip/validation.py b/pySim/esim/saip/validation.py index 2acc413..acf1864 100644 --- a/pySim/esim/saip/validation.py +++ b/pySim/esim/saip/validation.py @@ -94,3 +94,36 @@ raise ProfileError('profile-a-x25519 mandatory, but no usim or isim') if 'profile-a-p256' in m_svcs and not not ('usim' in m_svcs or 'isim' in m_svcs): raise ProfileError('profile-a-p256 mandatory, but no usim or isim') + +FileChoiceList = List[Tuple] + +class FileError(ProfileError): + pass + +class FileConstraintChecker: + def check(self, l: FileChoiceList): + for name in dir(self): + if name.startswith('check_'): + method = getattr(self, name) + method(l) + +class FileCheckBasicStructure(FileConstraintChecker): + def check_seqence(self, l: FileChoiceList): + by_type = {} + for k, v in l: + if k in by_type: + by_type[k].append(v) + else: + by_type[k] = [v] + if 'doNotCreate' in by_type: + if len(l) != 1: + raise FileError("doNotCreate must be the only element") + if 'fileDescriptor' in by_type: + if len(by_type['fileDescriptor']) != 1: + raise FileError("fileDescriptor must be the only element") + if l[0][0] != 'fileDescriptor': + raise FileError("fileDescriptor must be the first element") + + def check_forbidden(self, l: FileChoiceList): + """Perform checks for forbidden parameters as described in Section 8.3.3.""" + diff --git a/saip-test.py b/saip-test.py new file mode 100755 index 0000000..223bad7 --- /dev/null +++ b/saip-test.py @@ -0,0 +1,96 @@ +#!/usr/bin/env python3 + +from pySim.utils import b2h, h2b +from pySim.esim.saip import * +from pySim.esim.saip.validation import * + +from pySim.pprint import HexBytesPrettyPrinter + +pp = HexBytesPrettyPrinter(indent=4,width=500) + +import abc + + + + +with open('smdpp-data/upp/TS48 V2 eSIM_GTP_SAIP2.3_NoBERTLV.rename2der', 'rb') as f: + pes = ProfileElementSequence.from_der(f.read()) + +if False: + for pe in pes.pe_list: + print("="*70 + " " + pe.type) + pp.pprint(pe.decoded) + +if False: + for pe in pes: + print("="*70 + " " + pe.type) + pp.pprint(pe.decoded) + +if False: + for pe_type in pes.pe_by_type.keys(): + print("="*70 + " " + pe_type) + for pe in pes.pe_by_type[pe_type]: + pp.pprint(pe) + pp.pprint(pe.decoded) + +checker = CheckBasicStructure() +checker.check(pes) + +if False: + for naa in pes.pes_by_naa: + i = 0 + for naa_instance in pes.pes_by_naa[naa]: + print("="*70 + " " + naa + str(i)) + i += 1 + for pe in naa_instance: + pp.pprint(pe.type) + for d in pe.decoded: + print(" %s" % d) + #pp.pprint(pe.decoded[d]) + #if pe.type in ['akaParameter', 'pinCodes', 'pukCodes']: + # pp.pprint(pe.decoded) + + +from pySim.esim.saip.personalization import * + +params = [Iccid(h2b('98494400000000000001')), + Puk1(value=b'01234567'), Puk2(value=b'98765432'), Pin1(b'1111'), Pin2(b'2222'), Adm1(b'11111111'), + K(h2b('000102030405060708090a0b0c0d0e0f')), Opc(h2b('101112131415161718191a1b1c1d1e1f'))] + +from pySim.esim.saip.templates import * +import pySim.esim.saip.templates.v31 + +for p in params: + p.apply(pes) + +if False: + for pe in pes: + pp.pprint(pe.decoded) + pass + +naas = pes.pes_by_naa.keys() +for naa in naas: + for pe in pes.pes_by_naa[naa][0]: + print(pe) + #pp.pprint(pe.decoded) + #print(pe.header) + tpl_id = pe.templateID + if tpl_id: + prof = ProfileTemplateRegistry.get_by_oid(tpl_id) + print(prof) + #pp.pprint(pe.decoded) + for fname, fdata in pe.files.items(): + print() + print("============== %s" % fname) + ftempl = None + if prof: + ftempl = prof.files_by_pename[fname] + print("Template: %s" % repr(ftempl)) + print("Data: %s" % fdata) + file = File(fname, fdata, ftempl) + print(repr(file)) + #pp.pprint(pe.files) + + + +#print(ProfileTemplateRegistry.by_oid) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35733?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib1674920e488ade9597cb039e4e2047dcbc7864e Gerrit-Change-Number: 35733 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: saip.personalization: Fix ICCID fillFileContent replacement

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35730?usp=email ) Change subject: saip.personalization: Fix ICCID fillFileContent replacement ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35730?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic267fdde3b648b376ea6814783df1e90ea9bb9ad Gerrit-Change-Number: 35730 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 28 Jan 2024 21:05:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: saip.personalization: Also drop any fillFileOffset

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35729?usp=email ) Change subject: saip.personalization: Also drop any fillFileOffset ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35729?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3e4d97ae9de8a78f7bc0165ece5954481568b800 Gerrit-Change-Number: 35729 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 28 Jan 2024 21:05:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: saip.personalization: Also drop any fillFileOffset

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35729?usp=email ) Change subject: saip.personalization: Also drop any fillFileOffset ...................................................................... saip.personalization: Also drop any fillFileOffset When replacing a file's contents, we must not just remove any fillFileContent tuples, but also the fillFileOffset. Change-Id: I3e4d97ae9de8a78f7bc0165ece5954481568b800 --- M pySim/esim/saip/personalization.py 1 file changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/29/35729/1 diff --git a/pySim/esim/saip/personalization.py b/pySim/esim/saip/personalization.py index 32a53e6..bde7ce6 100644 --- a/pySim/esim/saip/personalization.py +++ b/pySim/esim/saip/personalization.py @@ -20,13 +20,13 @@ from pySim.esim.saip import ProfileElement, ProfileElementSequence -def remove_unwanted_tuples_from_list(l: List[Tuple], unwanted_key:str) -> List[Tuple]: +def remove_unwanted_tuples_from_list(l: List[Tuple], unwanted_keys: List[str]) -> List[Tuple]: """In a list of tuples, remove all tuples whose first part equals 'unwanted_key'.""" - return list(filter(lambda x: x[0] != unwanted_key, l)) + return list(filter(lambda x: x[0] not in unwanted_keys, l)) def file_replace_content(file: List[Tuple], new_content: bytes): """Completely replace all fillFileContent of a decoded 'File' with the new_content.""" - file = remove_unwanted_tuples_from_list(file, 'fillFileContent') + file = remove_unwanted_tuples_from_list(file, ['fillFileContent', 'fillFileOffset']) file.append(('fillFileContent', new_content)) return file -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35729?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3e4d97ae9de8a78f7bc0165ece5954481568b800 Gerrit-Change-Number: 35729 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: saip.personalization: Fix ICCID fillFileContent replacement

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35730?usp=email ) Change subject: saip.personalization: Fix ICCID fillFileContent replacement ...................................................................... saip.personalization: Fix ICCID fillFileContent replacement Change-Id: Ic267fdde3b648b376ea6814783df1e90ea9bb9ad --- M pySim/esim/saip/personalization.py 1 file changed, 13 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/30/35730/1 diff --git a/pySim/esim/saip/personalization.py b/pySim/esim/saip/personalization.py index bde7ce6..cb3edc1 100644 --- a/pySim/esim/saip/personalization.py +++ b/pySim/esim/saip/personalization.py @@ -26,7 +26,8 @@ def file_replace_content(file: List[Tuple], new_content: bytes): """Completely replace all fillFileContent of a decoded 'File' with the new_content.""" - file = remove_unwanted_tuples_from_list(file, ['fillFileContent', 'fillFileOffset']) + # use [:] to avoid making a copy, as we're doing in-place modification of the list here + file[:] = remove_unwanted_tuples_from_list(file, ['fillFileContent', 'fillFileOffset']) file.append(('fillFileContent', new_content)) return file @@ -54,9 +55,9 @@ name = 'iccid' def apply(self, pes: ProfileElementSequence): # patch the header; FIXME: swap nibbles! - pes.get_pe_by_type('header').decoded['iccid'] = self.value + pes.get_pe_for_type('header').decoded['iccid'] = self.value # patch MF/EF.ICCID - file_replace_content(pes.get_pe_by_type('mf').decoded['ef-iccid'], self.value) + file_replace_content(pes.get_pe_for_type('mf').decoded['ef-iccid'], bytes(self.value)) class Imsi(ConfigurableParameter): """Configurable IMSI. Expects value to be n EF.IMSI format.""" -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35730?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic267fdde3b648b376ea6814783df1e90ea9bb9ad Gerrit-Change-Number: 35730 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[L] Change in pysim[master]: add SAIP template handling + v3.1 definitions

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35731?usp=email ) Change subject: add SAIP template handling + v3.1 definitions ...................................................................... add SAIP template handling + v3.1 definitions Change-Id: I79bc0a480450ca2de4b687ba6f11d0a4ea4f14c8 --- A pySim/esim/saip/templates.py 1 file changed, 682 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/31/35731/1 diff --git a/pySim/esim/saip/templates.py b/pySim/esim/saip/templates.py new file mode 100644 index 0000000..5e25003 --- /dev/null +++ b/pySim/esim/saip/templates.py @@ -0,0 +1,673 @@ +# Implementation of SimAlliance/TCA Interoperable Profile Template handling +# +# (C) 2024 by Harald Welte <laforge(a)osmocom.org> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +from typing import * +from copy import deepcopy + +class FileTemplate: + """Representation of a single file in a SimAlliance/TCA Profile Template.""" + 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): + # initialize from arguments + self.fid = fid + self.name = name + if pe_name: + self.pe_name = pe_name + else: + self.pe_name = self.name.replace('.','-').replace('_','-').lower() + self.file_type = ftype + if ftype in ['LF', 'CY']: + self.nb_rec = nb_rec + self.rec_len = size + elif ftype in ['TR']: + self.file_size = size + self.arr = arr + self.sfi = sfi + self.default_val = default_val + self.content_rqd = content_rqd + self.params = params + self.ass_serv = ass_serv + self.high_update = high_update + # initialize empty + self.parent = None + self.children = [] + + def __str__(self) -> str: + return "FileTemplate(%s)" % (self.name) + + def __repr__(self) -> str: + s_fid = "%04x" % self.fid if self.fid != None else 'None' + s_arr = self.arr if self.arr != None else 'None' + s_sfi = "%02x" % self.sfi if self.sfi != 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) + +class ProfileTemplate: + """Representation of a SimAlliance/TCA Profile Template. Each Template is identified by its OID and + consists of a number of file definitions. We implement each profile template as a class derived from this + base class. Each such derived class is a singleton and has no instances.""" + created_by_default: bool = False + oid = None + files: List[FileTemplate] = [] + files_by_pename: dict[str,FileTemplate] = {} + + 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""" + super().__init_subclass__(**kwargs) + for f in cls.files: + cls.files_by_pename[f.pe_name] = f + ProfileTemplateRegistry.add(cls) + +def oid_l2s(l: List[int]): + return ".".join([str(x) for x in l]) + +class ProfileTemplateRegistry: + """A registry of profile templates. Exists as a singleton class with no instances and only + classmethods.""" + by_oid = {} + + @classmethod + def add(cls, tpl: ProfileTemplate): + oid_str = oid_l2s(tpl.oid) + if oid_str in cls.by_oid: + raise ValueError("We already have a template for OID %s" % oid_str) + cls.by_oid[oid_str] = tpl + + @classmethod + def get_by_oid(cls, oid: Union[List[int], str]): + if type(oid) is not str: + oid = oid_l2s(oid) + return cls.by_oid.get(oid, None) + +# Template definitions from "Profile interoperability specification V3.1 Final" (unless other version explicitly specified) + +# Section 9.2 +class FilesAtMF(ProfileTemplate): + created_by_default = True + oid = [2, 23, 143, 1, 2, 1] + files = [ + FileTemplate(0x3f00, 'MF', 'MF', None, None, 14, None, None, None, params=['pinStatusTemplateDO']), + FileTemplate(0x2f05, 'EF.PL', 'TR', None, 2, 1, 0x05, 'FF...FF', None), + FileTemplate(0x2f02, 'EF.ICCID', 'TR', None, 10, 11, None, None, True), + FileTemplate(0x2f00, 'EF.DIR', 'LF', None, None, 10, 0x1e, None, True, params=['nb_rec', 'size']), + FileTemplate(0x2f06, 'EF.ARR', 'LF', None, None, 10, None, None, True, params=['nb_rec', 'size']), + FileTemplate(0x2f08, 'EF.UMPC', 'TR', None, 5, 10, 0x08, None, False), + ] + + +# Section 9.3 +class FilesCD(ProfileTemplate): + created_by_default = False + oid = [2, 23, 143, 1, 2, 2] + files = [ + FileTemplate(0x7f11, 'DF.CD', 'DF', None, None, 14, None, None, False, params=['pinStatusTemplateDO']), + FileTemplate(0x6f01, 'EF.LAUNCHPAD', 'TR', None, None, 2, None, None, True, params=['size']), + ] + for i in range(0x40, 0x7f): + files.append(FileTemplate(0x6f00+i, 'EF.ICON', 'TR', None, None, 2, None, None, True, params=['size'])) + + +# 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']), +] +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'])) +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'])) +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 += [ + 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), +] +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'])) +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'])) +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'])) +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'])) +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'])) +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'])) +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'])) +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'])) +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'])) +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'])) + +# Section 9.4 v2.3.1 +class FilesTelecom(ProfileTemplate): + created_by_default = False + oid = [2, 23, 143, 1, 2, 3] + files = [ + FileTemplate(0x7f11, 'DF.TELECOM', 'DF', None, None, 14, None, None, False, params=['pinStatusTemplateDO']), + FileTemplate(0x6f06, 'EF.ARR', 'LF', None, None, 10, None, None, True, ['nb_rec', 'size']), + FileTemplate(0x6f53, 'EF.RMA', 'LF', None, None, 3, None, None, True, ['nb_rec', 'size']), + FileTemplate(0x6f54, 'EF.SUME', 'TR', None, 22, 3, None, None, True), + FileTemplate(0x6fe0, 'EF.ICE_DN', 'LF', 50, 24, 9, None, 'FF...FF', False), + 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']), + # 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']), + # 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'])) + for i in range(0x80, 0xC0): + files.append(FileTemplate(0x4f00+i, 'EF.ICON', 'TR', None, None, 10, None, None, True, ['size'])) + + # we copy the objects (instances) here as we also use them below from FilesUsimDfPhonebook + files += [deepcopy(x) for x in df_pb_files] + + 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(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), + ] + + +# Section 9.4 +class FilesTelecomV2(ProfileTemplate): + created_by_default = False + oid = [2, 23, 143, 1, 2, 3, 2] + files = [ + FileTemplate(0x7f11, 'DF.TELECOM', 'DF', None, None, 14, None, None, False, params=['pinStatusTemplateDO']), + FileTemplate(0x6f06, 'EF.ARR', 'LF', None, None, 10, None, None, True, ['nb_rec', 'size']), + FileTemplate(0x6f53, 'EF.RMA', 'LF', None, None, 3, None, None, True, ['nb_rec', 'size']), + FileTemplate(0x6f54, 'EF.SUME', 'TR', None, 22, 3, None, None, True), + FileTemplate(0x6fe0, 'EF.ICE_DN', 'LF', 50, 24, 9, None, 'FF...FF', False), + 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']), + # 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']), + # 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'])) + for i in range(0x80, 0xC0): + files.append(FileTemplate(0x4f00+i, 'EF.ICON', 'TR', None, None, 10, None, None, True, ['size'])) + + # we copy the objects (instances) here as we also use them below from FilesUsimDfPhonebook + files += [deepcopy(x) for x in df_pb_files] + + 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(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(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(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 + ] + + +# Section 9.5.1 v2.3.1 +class FilesUsimMandatory(ProfileTemplate): + created_by_default = True + oid = [2, 23, 143, 1, 2, 4] + files = [ + FileTemplate( None, 'ADF.USIM', 'ADF', None, None, 14, None, None, False, ['aid', 'temp_fid', 'pinStatusTemplateDO']), + FileTemplate(0x6f07, 'EF.IMSI', 'TR', None, 9, 2, 0x07, None, True, ['size']), + FileTemplate(0x6f06, 'EF.ARR', 'LF', None, None, 10, 0x17, None, True, ['nb_rec','size']), + FileTemplate(0x6f08, 'EF.Keys', 'TR', None, 33, 5, 0x08, '07FF...FF', False, high_update=True), + FileTemplate(0x6f09, 'EF.KeysPS', 'TR', None, 33, 5, 0x09, '07FF...FF', False, high_update=True, pe_name = 'ef-keysPS'), + FileTemplate(0x6f31, 'EF.HPPLMN', 'TR', None, 1, 2, 0x12, '0A', False), + FileTemplate(0x6f38, 'EF.UST', 'TR', None, 14, 2, 0x04, None, True), + FileTemplate(0x6f3b, 'EF.FDN', 'LF', 20, 26, 8, None, 'FF...FF', False, ass_serv=[2, 89]), + FileTemplate(0x6f3c, 'EF.SMS', 'LF', 10, 176, 5, None, '00FF...FF', False, ass_serv=[10]), + FileTemplate(0x6f42, 'EF.SMSP', 'LF', 1, 38, 5, None, 'FF...FF', False, ass_serv=[12]), + FileTemplate(0x6f43, 'EF.SMSS', 'TR', None, 2, 5, None, 'FFFF', False, ass_serv=[10]), + FileTemplate(0x6f46, 'EF.SPN', 'TR', None, 17, 10, None, None, True, ass_serv=[19]), + FileTemplate(0x6f56, 'EF.EST', 'TR', None, 1, 8, 0x05, None, True, ass_serv=[2,6,34,35]), + FileTemplate(0x6f5b, 'EF.START-HFN', 'TR', None, 6, 5, 0x0f, 'F00000F00000', False, high_update=True), + FileTemplate(0x6f5c, 'EF.THRESHOLD', 'TR', None, 3, 2, 0x10, 'FFFFFF', False), + FileTemplate(0x6f73, 'EF.PSLOCI', 'TR', None, 14, 5, 0x0c, 'FFFFFFFFFFFFFFFFFFFF0000FF01', False, high_update=True), + FileTemplate(0x6f78, 'EF.ACC', 'TR', None, 2, 2, 0x06, None, True), + FileTemplate(0x6f7b, 'EF.FPLMN', 'TR', None, 12, 5, 0x0d, 'FF...FF', False), + FileTemplate(0x6f7e, 'EF.LOCI', 'TR', None, 11, 5, 0x0b, 'FFFFFFFFFFFFFF0000FF01', False, high_update=True), + FileTemplate(0x6fad, 'EF.AD', 'TR', None, 4, 10, 0x03, '00000002', False), + FileTemplate(0x6fb7, 'EF.ECC', 'LF', 1, 4, 10, 0x01, None, True), + FileTemplate(0x6fc4, 'EF.NETPAR', 'TR', None, 128, 5, None, 'FF...FF', False, high_update=True), + FileTemplate(0x6fe3, 'EF.EPSLOCI', 'TR', None, 18, 5, 0x1e, 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000001', False, ass_serv=[85], high_update=True), + FileTemplate(0x6fe4, 'EF.EPSNSC', 'LF', 1, 80, 5, 0x18, 'FF...FF', False, ass_serv=[85], high_update=True), + ] + +# Section 9.5.1 +class FilesUsimMandatoryV2(ProfileTemplate): + created_by_default = True + oid = [2, 23, 143, 1, 2, 4, 2] + files = [ + FileTemplate( None, 'ADF.USIM', 'ADF', None, None, 14, None, None, False, ['aid', 'temp_fid', 'pinStatusTemplateDO']), + FileTemplate(0x6f07, 'EF.IMSI', 'TR', None, 9, 2, 0x07, None, True, ['size']), + FileTemplate(0x6f06, 'EF.ARR', 'LF', None, None, 10, 0x17, None, True, ['nb_rec','size']), + FileTemplate(0x6f08, 'EF.Keys', 'TR', None, 33, 5, 0x08, '07FF...FF', False, high_update=True), + FileTemplate(0x6f09, 'EF.KeysPS', 'TR', None, 33, 5, 0x09, '07FF...FF', False, high_update=True, pe_name='ef-keysPS'), + FileTemplate(0x6f31, 'EF.HPPLMN', 'TR', None, 1, 2, 0x12, '0A', False), + FileTemplate(0x6f38, 'EF.UST', 'TR', None, 17, 2, 0x04, None, True), + FileTemplate(0x6f3b, 'EF.FDN', 'LF', 20, 26, 8, None, 'FF...FF', False, ass_serv=[2, 89]), + FileTemplate(0x6f3c, 'EF.SMS', 'LF', 10, 176, 5, None, '00FF...FF', False, ass_serv=[10]), + FileTemplate(0x6f42, 'EF.SMSP', 'LF', 1, 38, 5, None, 'FF...FF', False, ass_serv=[12]), + FileTemplate(0x6f43, 'EF.SMSS', 'TR', None, 2, 5, None, 'FFFF', False, ass_serv=[10]), + FileTemplate(0x6f46, 'EF.SPN', 'TR', None, 17, 10, None, None, True, ass_serv=[19]), + FileTemplate(0x6f56, 'EF.EST', 'TR', None, 1, 8, 0x05, None, True, ass_serv=[2,6,34,35]), + FileTemplate(0x6f5b, 'EF.START-HFN', 'TR', None, 6, 5, 0x0f, 'F00000F00000', False, high_update=True), + FileTemplate(0x6f5c, 'EF.THRESHOLD', 'TR', None, 3, 2, 0x10, 'FFFFFF', False), + FileTemplate(0x6f73, 'EF.PSLOCI', 'TR', None, 14, 5, 0x0c, 'FFFFFFFFFFFFFFFFFFFF0000FF01', False, high_update=True), + FileTemplate(0x6f78, 'EF.ACC', 'TR', None, 2, 2, 0x06, None, True), + FileTemplate(0x6f7b, 'EF.FPLMN', 'TR', None, 12, 5, 0x0d, 'FF...FF', False), + FileTemplate(0x6f7e, 'EF.LOCI', 'TR', None, 11, 5, 0x0b, 'FFFFFFFFFFFFFF0000FF01', False, high_update=True), + FileTemplate(0x6fad, 'EF.AD', 'TR', None, 4, 10, 0x03, '00000002', False), + FileTemplate(0x6fb7, 'EF.ECC', 'LF', 1, 4, 10, 0x01, None, True), + FileTemplate(0x6fc4, 'EF.NETPAR', 'TR', None, 128, 5, None, 'FF...FF', False, high_update=True), + FileTemplate(0x6fe3, 'EF.EPSLOCI', 'TR', None, 18, 5, 0x1e, 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000001', False, ass_serv=[85], high_update=True), + FileTemplate(0x6fe4, 'EF.EPSNSC', 'LF', 1, 80, 5, 0x18, 'FF...FF', False, ass_serv=[85], high_update=True), + ] + + +# Section 9.5.2 v2.3.1 +class FilesUsimOptional(ProfileTemplate): + created_by_default = False + oid = [2, 23, 143, 1, 2, 5] + 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'), + FileTemplate(0x6f39, 'EF.ACM', 'CY', 1, 3, 7, None, '000000', False, ass_serv=[13], high_update=True), + FileTemplate(0x6f3e, 'EF.GID1', 'TR', None, 8, 2, None, None, True, ass_serv=[17]), + FileTemplate(0x6f3f, 'EF.GID2', 'TR', None, 8, 2, None, None, True, ass_serv=[18]), + FileTemplate(0x6f40, 'EF.MSISDN', 'LF', 1, 24, 2, None, 'FF...FF', False, ass_serv=[21]), + FileTemplate(0x6f41, 'EF.PUCT', 'TR', None, 5, 5, None, 'FFFFFF0000', False, ass_serv=[13]), + FileTemplate(0x6f45, 'EF.CBMI', 'TR', None, 10, 5, None, 'FF...FF', False, ass_serv=[15]), + FileTemplate(0x6f48, 'EF.CBMID', 'TR', None, 10, 2, 0x0e, 'FF...FF', False, ass_serv=[19]), + FileTemplate(0x6f49, 'EF.SDN', 'LF', 10, 24, 2, None, 'FF...FF', False, ass_serv=[4,89]), + FileTemplate(0x6f4b, 'EF.EXT2', 'LF', 10, 13, 8, None, '00FF...FF', False, ass_serv=[3]), + FileTemplate(0x6f4c, 'EF.EXT3', 'LF', 10, 13, 2, None, '00FF...FF', False, ass_serv=[5]), + FileTemplate(0x6f50, 'EF.CBMIR', 'TR', None, 20, 5, None, 'FF...FF', False, ass_serv=[16]), + FileTemplate(0x6f60, 'EF.PLMNwAcT', 'TR', None, 40, 5, 0x0a, 'FFFFFF0000'*8, False, ass_serv=[20]), + FileTemplate(0x6f61, 'EF.OPLMNwAcT', 'TR', None, 40, 2, 0x11, 'FFFFFF0000'*8, False, ass_serv=[42]), + FileTemplate(0x6f62, 'EF.HPLMNwAcT', 'TR', None, 5, 2, 0x13, 'FFFFFF0000', False, ass_serv=[43]), + FileTemplate(0x6f2c, 'EF.DCK', 'TR', None, 16, 5, None, 'FF...FF', False, ass_serv=[36]), + FileTemplate(0x6f32, 'EF.CNL', 'TR', None, 30, 2, None, 'FF...FF', False, ass_serv=[37]), + FileTemplate(0x6f47, 'EF.SMSR', 'LF', 10, 30, 5, None, '00FF...FF', False, ass_serv=[11]), + FileTemplate(0x6f4d, 'EF.BDN', 'LF', 10, 25, 8, None, 'FF...FF', False, ass_serv=[6]), + FileTemplate(0x6f4e, 'EF.EXT5', 'LF', 10, 13, 5, None, '00FF...FF', False, ass_serv=[44]), + FileTemplate(0x6f4f, 'EF.CCP2', 'LF', 5, 15, 5, 0x16, 'FF...FF', False, ass_serv=[14]), + FileTemplate(0x6f55, 'EF.EXT4', 'LF', 10, 13, 8, None, '00FF...FF', False, ass_serv=[7]), + FileTemplate(0x6f57, 'EF.ACL', 'TR', None, 101, 8, None, '00FF...FF', False, ass_serv=[35]), + FileTemplate(0x6f58, 'EF.CMI', 'LF', 10, 11, 2, None, 'FF...FF', False, ass_serv=[6]), + FileTemplate(0x6f80, 'EF.ICI', 'CY', 20, 38, 5, 0x14, 'FF...FF0000000001FFFF', False, ass_serv=[9], high_update=True), + FileTemplate(0x6f81, 'EF.OCI', 'CY', 20, 37, 5, 0x15, 'FF...FF00000001FFFF', False, ass_serv=[8], high_update=True), + FileTemplate(0x6f82, 'EF.ICT', 'CY', 1, 3, 7, None, '000000', False, ass_serv=[9], high_update=True), + FileTemplate(0x6f83, 'EF.OCT', 'CY', 1, 3, 7, None, '000000', False, ass_serv=[8], high_update=True), + FileTemplate(0x6fb1, 'EF.VGCS', 'TR', None, 20, 2, None, None, True, ass_serv=[57]), + FileTemplate(0x6fb2, 'EF.VGCSS', 'TR', None, 7, 5, None, None, True, ass_serv=[57]), + FileTemplate(0x6fb3, 'EF.VBS', 'TR', None, 20, 2, None, None, True, ass_serv=[58]), + FileTemplate(0x6fb4, 'EF.VBSS', 'TR', None, 7, 5, None, None, True, ass_serv=[58]), # ARR 2!?? + FileTemplate(0x6fb5, 'EF.eMLPP', 'TR', None, 2, 2, None, None, True, ass_serv=[24]), + FileTemplate(0x6fb6, 'EF.AaeM', 'TR', None, 1, 5, None, '00', False, ass_serv=[25]), + FileTemplate(0x6fc3, 'EF.HiddenKey', 'TR', None, 4, 5, None, 'FF...FF', False), + FileTemplate(0x6fc5, 'EF.PNN', 'LF', 10, 16, 10, 0x19, None, True, ass_serv=[45]), + FileTemplate(0x6fc6, 'EF.OPL', 'LF', 5, 8, 10, 0x1a, None, True, ass_serv=[46]), + FileTemplate(0x6fc7, 'EF.MBDN', 'LF', 3, 24, 5, None, None, True, ass_serv=[47]), + FileTemplate(0x6fc8, 'EF.EXT6', 'LF', 10, 13, 5, None, '00FF...FF', False, ass_serv=[47]), + FileTemplate(0x6fc9, 'EF.MBI', 'LF', 10, 5, 5, None, None, True, ass_serv=[47]), + FileTemplate(0x6fca, 'EF.MWIS', 'LF', 10, 6, 5, None, '00...00', False, ass_serv=[48], high_update=True), + FileTemplate(0x6fcb, 'EF.CFIS', 'LF', 10, 16, 5, None, '0100FF...FF', False, ass_serv=[49]), + FileTemplate(0x6fcb, 'EF.EXT7', 'LF', 10, 13, 5, None, '00FF...FF', False, ass_serv=[49]), + FileTemplate(0x6fcd, 'EF.SPDI', 'TR', None, 17, 2, 0x1b, None, True, ass_serv=[51]), + FileTemplate(0x6fce, 'EF.MMSN', 'LF', 10, 6, 5, None, '000000FF...FF', False, ass_serv=[52]), + FileTemplate(0x6fcf, 'EF.EXT8', 'LF', 10, 13, 5, None, '00FF...FF', False, ass_serv=[53]), + FileTemplate(0x6fd0, 'EF.MMSICP', 'TR', None, 100, 2, None, 'FF...FF', False, ass_serv=[52]), + FileTemplate(0x6fd1, 'EF.MMSUP', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size'], ass_serv=[52]), + FileTemplate(0x6fd2, 'EF.MMSUCP', 'TR', None, 100, 5, None, 'FF...FF', False, ass_serv=[52,55]), + FileTemplate(0x6fd3, 'EF.NIA', 'LF', 5, 11, 2, None, 'FF...FF', False, ass_serv=[56]), + FileTemplate(0x6fd4, 'EF.VGCSCA', 'TR', None, None, 2, None, '00...00', False, ['size'], ass_serv=[64]), + FileTemplate(0x6fd5, 'EF.VBSCA', 'TR', None, None, 2, None, '00...00', False, ['size'], ass_serv=[65]), + FileTemplate(0x6fd6, 'EF.GBABP', 'TR', None, None, 5, None, 'FF...FF', False, ['size'], ass_serv=[68]), + FileTemplate(0x6fd7, 'EF.MSK', 'LF', None, None, 2, None, 'FF...FF', False, ['nb_rec','size'], ass_serv=[69], high_update=True), + FileTemplate(0x6fd8, 'EF.MUK', 'LF', None, None, 2, None, 'FF...FF', False, ['nb_rec','size'], ass_serv=[69]), + FileTemplate(0x6fd9, 'EF.EHPLMN', 'TR', None, 15, 2, 0x1d, 'FF...FF', False, ass_serv=[71]), + FileTemplate(0x6fda, 'EF.GBANL', 'LF', None, None, 2, None, 'FF...FF', False, ['nb_rec','size'], ass_serv=[68]), + FileTemplate(0x6fdb, 'EF.EHPLMNPI', 'TR', None, 1, 2, None, '00', False, ass_serv=[71,73]), + FileTemplate(0x6fdc, 'EF.LRPLMNSI', 'TR', None, 1, 2, None, '00', False, ass_serv=[74]), + FileTemplate(0x6fdd, 'EF.NAFKCA', 'LF', None, None, 2, None, 'FF...FF', False, ['nb_rec','size'], ass_serv=[68,76]), + FileTemplate(0x6fde, 'EF.SPNI', 'TR', None, None, 10, None, '00FF...FF', False, ['size'], ass_serv=[78]), + FileTemplate(0x6fdf, 'EF.PNNI', 'LF', None, None, 10, None, '00FF...FF', False, ['nb_rec','size'], ass_serv=[79]), + FileTemplate(0x6fe2, 'EF.NCP-IP', 'LF', None, None, 2, None, None, True, ['nb_rec','size'], ass_serv=[80]), + FileTemplate(0x6fe6, 'EF.UFC', 'TR', None, 30, 10, None, '801E60C01E900080040000000000000000F0000000004000000000000080', False), + FileTemplate(0x6fe8, 'EF.NASCONFIG', 'TR', None, 18, 2, None, None, True, ass_serv=[96]), + FileTemplate(0x6fe7, 'EF.UICCIARI', 'LF', None, None, 2, None, None, True, ['nb_rec','size'], ass_serv=[95]), + FileTemplate(0x6fec, 'EF.PWS', 'TR', None, None, 10, None, None, True, ['size'], ass_serv=[97]), + FileTemplate(0x6fed, 'EF.FDNURI', 'LF', None, None, 8, None, 'FF...FF', False, ['nb_rec','size'], ass_serv=[2,99]), + FileTemplate(0x6fee, 'EF.BDNURI', 'LF', None, None, 8, None, 'FF...FF', False, ['nb_rec','size'], ass_serv=[6,99]), + FileTemplate(0x6fef, 'EF.SDNURI', 'LF', None, None, 2, None, 'FF...FF', False, ['nb_rec','size'], ass_serv=[4,99]), + FileTemplate(0x6ff0, 'EF.IWL', 'LF', None, None, 3, None, 'FF...FF', False, ['nb_rec','size'], ass_serv=[102]), + FileTemplate(0x6ff1, 'EF.IPS', 'CY', None, 4, 10, None, 'FF...FF', False, ['size'], ass_serv=[102], high_update=True), + FileTemplate(0x6ff2, 'EF.IPD', 'LF', None, None, 3, None, 'FF...FF', False, ['nb_rec','size'], ass_serv=[102], high_update=True), + ] + + +# Section 9.5.2 +class FilesUsimOptionalV2(ProfileTemplate): + created_by_default = False + oid = [2, 23, 143, 1, 2, 5, 2] + 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]), + FileTemplate(0x6f39, 'EF.ACM', 'CY', 1, 3, 7, None, '000000', False, ass_serv=[13], high_update=True), + FileTemplate(0x6f3e, 'EF.GID1', 'TR', None, 8, 2, None, None, True, ass_serv=[17]), + FileTemplate(0x6f3f, 'EF.GID2', 'TR', None, 8, 2, None, None, True, ass_serv=[18]), + FileTemplate(0x6f40, 'EF.MSISDN', 'LF', 1, 24, 2, None, 'FF...FF', False, ass_serv=[21]), + FileTemplate(0x6f41, 'EF.PUCT', 'TR', None, 5, 5, None, 'FFFFFF0000', False, ass_serv=[13]), + FileTemplate(0x6f45, 'EF.CBMI', 'TR', None, 10, 5, None, 'FF...FF', False, ass_serv=[15]), + FileTemplate(0x6f48, 'EF.CBMID', 'TR', None, 10, 2, 0x0e, 'FF...FF', False, ass_serv=[19]), + FileTemplate(0x6f49, 'EF.SDN', 'LF', 10, 24, 2, None, 'FF...FF', False, ass_serv=[4,89]), + FileTemplate(0x6f4b, 'EF.EXT2', 'LF', 10, 13, 8, None, '00FF...FF', False, ass_serv=[3]), + FileTemplate(0x6f4c, 'EF.EXT3', 'LF', 10, 13, 2, None, '00FF...FF', False, ass_serv=[5]), + FileTemplate(0x6f50, 'EF.CBMIR', 'TR', None, 20, 5, None, 'FF...FF', False, ass_serv=[16]), + FileTemplate(0x6f60, 'EF.PLMNwAcT', 'TR', None, 40, 5, 0x0a, 'FFFFFF0000'*8, False, ass_serv=[20]), + FileTemplate(0x6f61, 'EF.OPLMNwAcT', 'TR', None, 40, 2, 0x11, 'FFFFFF0000'*8, False, ass_serv=[42]), + FileTemplate(0x6f62, 'EF.HPLMNwAcT', 'TR', None, 5, 2, 0x13, 'FFFFFF0000', False, ass_serv=[43]), + FileTemplate(0x6f2c, 'EF.DCK', 'TR', None, 16, 5, None, 'FF...FF', False, ass_serv=[36]), + FileTemplate(0x6f32, 'EF.CNL', 'TR', None, 30, 2, None, 'FF...FF', False, ass_serv=[37]), + FileTemplate(0x6f47, 'EF.SMSR', 'LF', 10, 30, 5, None, '00FF...FF', False, ass_serv=[11]), + FileTemplate(0x6f4d, 'EF.BDN', 'LF', 10, 25, 8, None, 'FF...FF', False, ass_serv=[6]), + FileTemplate(0x6f4e, 'EF.EXT5', 'LF', 10, 13, 5, None, '00FF...FF', False, ass_serv=[44]), + FileTemplate(0x6f4f, 'EF.CCP2', 'LF', 5, 15, 5, 0x16, 'FF...FF', False, ass_serv=[14]), + FileTemplate(0x6f55, 'EF.EXT4', 'LF', 10, 13, 8, None, '00FF...FF', False, ass_serv=[7]), + FileTemplate(0x6f57, 'EF.ACL', 'TR', None, 101, 8, None, '00FF...FF', False, ass_serv=[35]), + FileTemplate(0x6f58, 'EF.CMI', 'LF', 10, 11, 2, None, 'FF...FF', False, ass_serv=[6]), + FileTemplate(0x6f80, 'EF.ICI', 'CY', 20, 38, 5, 0x14, 'FF...FF0000000001FFFF', False, ass_serv=[9], high_update=True), + FileTemplate(0x6f81, 'EF.OCI', 'CY', 20, 37, 5, 0x15, 'FF...FF00000001FFFF', False, ass_serv=[8], high_update=True), + FileTemplate(0x6f82, 'EF.ICT', 'CY', 1, 3, 7, None, '000000', False, ass_serv=[9], high_update=True), + FileTemplate(0x6f83, 'EF.OCT', 'CY', 1, 3, 7, None, '000000', False, ass_serv=[8], high_update=True), + FileTemplate(0x6fb1, 'EF.VGCS', 'TR', None, 20, 2, None, None, True, ass_serv=[57]), + FileTemplate(0x6fb2, 'EF.VGCSS', 'TR', None, 7, 5, None, None, True, ass_serv=[57]), + FileTemplate(0x6fb3, 'EF.VBS', 'TR', None, 20, 2, None, None, True, ass_serv=[58]), + FileTemplate(0x6fb4, 'EF.VBSS', 'TR', None, 7, 5, None, None, True, ass_serv=[58]), # ARR 2!?? + FileTemplate(0x6fb5, 'EF.eMLPP', 'TR', None, 2, 2, None, None, True, ass_serv=[24]), + FileTemplate(0x6fb6, 'EF.AaeM', 'TR', None, 1, 5, None, '00', False, ass_serv=[25]), + FileTemplate(0x6fc3, 'EF.HiddenKey', 'TR', None, 4, 5, None, 'FF...FF', False), + FileTemplate(0x6fc5, 'EF.PNN', 'LF', 10, 16, 10, 0x19, None, True, ass_serv=[45]), + FileTemplate(0x6fc6, 'EF.OPL', 'LF', 5, 8, 10, 0x1a, None, True, ass_serv=[46]), + FileTemplate(0x6fc7, 'EF.MBDN', 'LF', 3, 24, 5, None, None, True, ass_serv=[47]), + FileTemplate(0x6fc8, 'EF.EXT6', 'LF', 10, 13, 5, None, '00FF...FF', False, ass_serv=[47]), + FileTemplate(0x6fc9, 'EF.MBI', 'LF', 10, 5, 5, None, None, True, ass_serv=[47]), + FileTemplate(0x6fca, 'EF.MWIS', 'LF', 10, 6, 5, None, '00...00', False, ass_serv=[48], high_update=True), + FileTemplate(0x6fcb, 'EF.CFIS', 'LF', 10, 16, 5, None, '0100FF...FF', False, ass_serv=[49]), + FileTemplate(0x6fcb, 'EF.EXT7', 'LF', 10, 13, 5, None, '00FF...FF', False, ass_serv=[49]), + FileTemplate(0x6fcd, 'EF.SPDI', 'TR', None, 17, 2, 0x1b, None, True, ass_serv=[51]), + FileTemplate(0x6fce, 'EF.MMSN', 'LF', 10, 6, 5, None, '000000FF...FF', False, ass_serv=[52]), + FileTemplate(0x6fcf, 'EF.EXT8', 'LF', 10, 13, 5, None, '00FF...FF', False, ass_serv=[53]), + FileTemplate(0x6fd0, 'EF.MMSICP', 'TR', None, 100, 2, None, 'FF...FF', False, ass_serv=[52]), + FileTemplate(0x6fd1, 'EF.MMSUP', 'LF', None, None, 5, None, 'FF...FF', False, ['nb_rec','size'], ass_serv=[52]), + FileTemplate(0x6fd2, 'EF.MMSUCP', 'TR', None, 100, 5, None, 'FF...FF', False, ass_serv=[52,55]), + FileTemplate(0x6fd3, 'EF.NIA', 'LF', 5, 11, 2, None, 'FF...FF', False, ass_serv=[56]), + FileTemplate(0x6fd4, 'EF.VGCSCA', 'TR', None, None, 2, None, '00...00', False, ['size'], ass_serv=[64]), + FileTemplate(0x6fd5, 'EF.VBSCA', 'TR', None, None, 2, None, '00...00', False, ['size'], ass_serv=[65]), + FileTemplate(0x6fd6, 'EF.GBABP', 'TR', None, None, 5, None, 'FF...FF', False, ['size'], ass_serv=[68]), + FileTemplate(0x6fd7, 'EF.MSK', 'LF', None, None, 2, None, 'FF...FF', False, ['nb_rec','size'], ass_serv=[69], high_update=True), + FileTemplate(0x6fd8, 'EF.MUK', 'LF', None, None, 2, None, 'FF...FF', False, ['nb_rec','size'], ass_serv=[69]), + FileTemplate(0x6fd9, 'EF.EHPLMN', 'TR', None, 15, 2, 0x1d, 'FF...FF', False, ass_serv=[71]), + FileTemplate(0x6fda, 'EF.GBANL', 'LF', None, None, 2, None, 'FF...FF', False, ['nb_rec','size'], ass_serv=[68]), + FileTemplate(0x6fdb, 'EF.EHPLMNPI', 'TR', None, 1, 2, None, '00', False, ass_serv=[71,73]), + FileTemplate(0x6fdc, 'EF.LRPLMNSI', 'TR', None, 1, 2, None, '00', False, ass_serv=[74]), + FileTemplate(0x6fdd, 'EF.NAFKCA', 'LF', None, None, 2, None, 'FF...FF', False, ['nb_rec','size'], ass_serv=[68,76]), + FileTemplate(0x6fde, 'EF.SPNI', 'TR', None, None, 10, None, '00FF...FF', False, ['size'], ass_serv=[78]), + FileTemplate(0x6fdf, 'EF.PNNI', 'LF', None, None, 10, None, '00FF...FF', False, ['nb_rec','size'], ass_serv=[79]), + FileTemplate(0x6fe2, 'EF.NCP-IP', 'LF', None, None, 2, None, None, True, ['nb_rec','size'], ass_serv=[80]), + FileTemplate(0x6fe6, 'EF.UFC', 'TR', None, 30, 10, None, '801E60C01E900080040000000000000000F0000000004000000000000080', False), + FileTemplate(0x6fe8, 'EF.NASCONFIG', 'TR', None, 18, 2, None, None, True, ass_serv=[96]), + FileTemplate(0x6fe7, 'EF.UICCIARI', 'LF', None, None, 2, None, None, True, ['nb_rec','size'], ass_serv=[95]), + FileTemplate(0x6fec, 'EF.PWS', 'TR', None, None, 10, None, None, True, ['size'], ass_serv=[97]), + FileTemplate(0x6fed, 'EF.FDNURI', 'LF', None, None, 8, None, 'FF...FF', False, ['nb_rec','size'], ass_serv=[2,99]), + FileTemplate(0x6fee, 'EF.BDNURI', 'LF', None, None, 8, None, 'FF...FF', False, ['nb_rec','size'], ass_serv=[6,99]), + FileTemplate(0x6fef, 'EF.SDNURI', 'LF', None, None, 2, None, 'FF...FF', False, ['nb_rec','size'], ass_serv=[4,99]), + FileTemplate(0x6ff0, 'EF.IWL', 'LF', None, None, 3, None, 'FF...FF', False, ['nb_rec','size'], ass_serv=[102]), + FileTemplate(0x6ff1, 'EF.IPS', 'CY', None, 4, 10, None, 'FF...FF', False, ['size'], ass_serv=[102], high_update=True), + FileTemplate(0x6ff2, 'EF.IPD', 'LF', None, None, 3, None, 'FF...FF', False, ['nb_rec','size'], ass_serv=[102], high_update=True), + FileTemplate(0x6ff3, 'EF.EPDGID', 'TR', None, None, 2, None, None, True, ['size'], ass_serv=[(106, 107)]), + FileTemplate(0x6ff4, 'EF.EPDGSELECTION','TR',None,None, 2, None, None, True, ['size'], ass_serv=[(106, 107)]), + FileTemplate(0x6ff5, 'EF.EPDGIDEM', 'TR', None, None, 2, None, None, True, ['size'], ass_serv=[(110, 111)]), + FileTemplate(0x6ff6, 'EF.EPDGIDEMSEL','TR',None, None, 2, None, None, True, ['size'], ass_serv=[(110, 111)]), + FileTemplate(0x6ff7, 'EF.FromPreferred','TR',None, 1, 2, None, '00', False, ass_serv=[114]), + FileTemplate(0x6ff8, 'EF.IMSConfigData','BT',None,None, 2, None, None, True, ['size'], ass_serv=[115]), + FileTemplate(0x6ff9, 'EF.3GPPPSDataOff','TR',None, 4, 2, None, None, True, ass_serv=[117]), + FileTemplate(0x6ffa, 'EF.3GPPPSDOSLIST','LF',None, None, 2, None, None, True, ['nb_rec','size'], ass_serv=[118]), + FileTemplate(0x6ffc, 'EF.XCAPConfigData','BT',None,None, 2, None, None, True, ['size'], ass_serv=[120]), + FileTemplate(0x6ffd, 'EF.EARFCNLIST','TR', None, None, 10, None, None, True, ['size'], ass_serv=[121]), + FileTemplate(0x6ffd, 'EF.MudMidCfgdata','BT', None, None,2, None, None, True, ['size'], ass_serv=[134]), + ] + + +# Section 9.5.3 +class FilesUsimDfPhonebook(ProfileTemplate): + created_by_default = False + oid = [2, 23, 143, 1, 2, 6] + files = df_pb_files + + +# Section 9.5.4 +class FilesUsimDfGsmAccess(ProfileTemplate): + created_by_default = False + oid = [2, 23, 143, 1, 2, 7] + 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), + FileTemplate(0x4f52, 'EF.KcGPRS', 'TR', None, 9, 5, 0x02, 'FF...FF07', False, ass_serv=[27], high_update=True), + FileTemplate(0x4f63, 'EF.CPBCCH', 'TR', None, 10, 5, None, 'FF...FF', False, ass_serv=[39], high_update=True), + FileTemplate(0x4f64, 'EF.InvScan', 'TR', None, 1, 2, None, '00', False, ass_serv=[40]), + ] + + +# Sectionm 9.5.11 v2.3.1 +class FilesUsimDf5GSv2(ProfileTemplate): + created_by_default = False + oid = [2, 23, 143, 1, 2, 13] + 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), + FileTemplate(0x4f02, 'EF.5GSN3GPPLOCI', 'TR', None, 20, 5, 0x02, 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000001', False, ass_serv=[122], high_update=True), + FileTemplate(0x4f03, 'EF.5GS3GPPNSC', 'LF', 1, 57, 5, 0x03, 'FF...FF', False, ass_serv=[122], high_update=True), + FileTemplate(0x4f04, 'EF.5GSN3GPPNSC', 'LF', 1, 57, 5, 0x04, 'FF...FF', False, ass_serv=[122], high_update=True), + FileTemplate(0x4f05, 'EF.5GAUTHKEYS', 'TR', None, 110, 5, 0x05, None, True, ass_serv=[123], high_update=True), + FileTemplate(0x4f06, 'EF.UAC_AIC', 'TR', None, 4, 2, 0x06, None, True, ass_serv=[126]), + FileTemplate(0x4f07, 'EF.SUCI_Calc_Info', 'TR', None, None, 2, 0x07, 'FF...FF', False, ass_serv=[124]), + FileTemplate(0x4f08, 'EF.OPL5G', 'LF', None, 10, 10, 0x08, 'FF...FF', False, ['nb_rec'], ass_serv=[129]), + FileTemplate(0x4f09, 'EF.SUPI_NAI', 'TR', None, None, 2, 0x09, None, True, ['size'], ass_serv=[130]), + FileTemplate(0x4f0a, 'EF.Routing_Indicator', 'TR', None, 4, 2, 0x0a, 'F0FFFFFF', False, ass_serv=[124]), + ] + + +# Sectionm 9.5.11.2 +class FilesUsimDf5GSv2(ProfileTemplate): + created_by_default = False + oid = [2, 23, 143, 1, 2, 13, 2] + 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), + FileTemplate(0x4f02, 'EF.5GSN3GPPLOCI', 'TR', None, 20, 5, 0x02, 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000001', False, ass_serv=[122], high_update=True), + FileTemplate(0x4f03, 'EF.5GS3GPPNSC', 'LF', 1, 57, 5, 0x03, 'FF...FF', False, ass_serv=[122], high_update=True), + FileTemplate(0x4f04, 'EF.5GSN3GPPNSC', 'LF', 1, 57, 5, 0x04, 'FF...FF', False, ass_serv=[122], high_update=True), + FileTemplate(0x4f05, 'EF.5GAUTHKEYS', 'TR', None, 110, 5, 0x05, None, True, ass_serv=[123], high_update=True), + FileTemplate(0x4f06, 'EF.UAC_AIC', 'TR', None, 4, 2, 0x06, None, True, ass_serv=[126]), + FileTemplate(0x4f07, 'EF.SUCI_Calc_Info', 'TR', None, None, 2, 0x07, 'FF...FF', False, ass_serv=[124]), + FileTemplate(0x4f08, 'EF.OPL5G', 'LF', None, 10, 10, 0x08, 'FF...FF', False, ['nb_rec'], ass_serv=[129]), + FileTemplate(0x4f09, 'EF.SUPI_NAI', 'TR', None, None, 2, 0x09, None, True, ['size'], ass_serv=[130]), + FileTemplate(0x4f0a, 'EF.Routing_Indicator', 'TR', None, 4, 2, 0x0a, 'F0FFFFFF', False, ass_serv=[124]), + FileTemplate(0x4f0b, 'EF.URSP', 'BT', None, None, 2, None, None, False, ass_serv=[132]), + FileTemplate(0x4f0c, 'EF.TN3GPPSNN', 'TR', None, 1, 2, 0x0c, '00', False, ass_serv=[135]), + ] + + +# Sectionm 9.5.11.3 +class FilesUsimDf5GSv3(ProfileTemplate): + created_by_default = False + oid = [2, 23, 143, 1, 2, 13, 3] + 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), + FileTemplate(0x4f02, 'EF.5GSN3GPPLOCI', 'TR', None, 20, 5, 0x02, 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000001', False, ass_serv=[122], high_update=True), + FileTemplate(0x4f03, 'EF.5GS3GPPNSC', 'LF', 2, 62, 5, 0x03, 'FF...FF', False, ass_serv=[122,136], high_update=True), + # ^ If Service n°136 is not "available" in EF UST, the Profile Creator shall ensure that these files shall contain one record; otherwise, they shall contain 2 records. + FileTemplate(0x4f04, 'EF.5GSN3GPPNSC', 'LF', 2, 62, 5, 0x04, 'FF...FF', False, ass_serv=[122,136], high_update=True), + # ^ If Service n°136 is not "available" in EF UST, the Profile Creator shall ensure that these files shall contain one record; otherwise, they shall contain 2 records. + FileTemplate(0x4f05, 'EF.5GAUTHKEYS', 'TR', None, 110, 5, 0x05, None, True, ass_serv=[123], high_update=True), + FileTemplate(0x4f06, 'EF.UAC_AIC', 'TR', None, 4, 2, 0x06, None, True, ass_serv=[126]), + FileTemplate(0x4f07, 'EF.SUCI_Calc_Info', 'TR', None, None, 2, 0x07, 'FF...FF', False, ass_serv=[124]), + FileTemplate(0x4f08, 'EF.OPL5G', 'LF', None, 10, 10, 0x08, 'FF...FF', False, ['nb_rec'], ass_serv=[129]), + FileTemplate(0x4f09, 'EF.SUPI_NAI', 'TR', None, None, 2, 0x09, None, True, ['size'], ass_serv=[130], pe_name='ef-supinai'), + FileTemplate(0x4f0a, 'EF.Routing_Indicator', 'TR', None, 4, 2, 0x0a, 'F0FFFFFF', False, ass_serv=[124]), + FileTemplate(0x4f0b, 'EF.URSP', 'BT', None, None, 2, None, None, False, ass_serv=[132]), + FileTemplate(0x4f0c, 'EF.TN3GPPSNN', 'TR', None, 1, 2, 0x0c, '00', False, ass_serv=[135]), + ] + + +# Sectionm 9.5.12 +class FilesUsimDfSaip(ProfileTemplate): + created_by_default = False + oid = [2, 23, 143, 1, 2, 14] + 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'), + ] + + +# Section 9.6.1 +class FilesIsimMandatory(ProfileTemplate): + created_by_default = True + oid = [2, 23, 143, 1, 2, 8] + files = [ + FileTemplate( None, 'ADF.ISIM', 'ADF', None, None, 14, None, None, False, ['aid','temporary_fid''pinStatusTemplateDO']), + FileTemplate(0x6f02, 'EF.IMPI', 'TR', None, None, 2, 0x02, None, True, ['size']), + FileTemplate(0x6f04, 'EF.IMPU', 'LF', 1, None, 2, 0x04, None, True, ['size']), + FileTemplate(0x6f03, 'EF.Domain', 'TR', None, None, 2, 0x05, None, True, ['size']), + FileTemplate(0x6f07, 'EF.IST', 'TR', None, 14, 2, 0x07, None, True), + FileTemplate(0x6fad, 'EF.AD', 'TR', None, 3, 10, 0x03, '000000', False), + FileTemplate(0x6f06, 'EF.ARR', 'LF', None, None, 10, 0x06, None, True, ['nb_rec','size']), + ] + + +# Section 9.6.2 v2.3.1 +class FilesIsimOptional(ProfileTemplate): + created_by_default = False + oid = [2, 23, 143, 1, 2, 9] + 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]), + FileTemplate(0x6f42, 'EF.SMSP', 'LF', 1, 38, 5, None, 'FF...FF', False, ass_serv=[8]), + FileTemplate(0x6f43, 'EF.SMSS', 'TR', None, 2, 5, None, 'FFFF', False, ass_serv=[6,8]), + FileTemplate(0x6f47, 'EF.SMSR', 'LF', 10, 30, 5, None, '00FF...FF', False, ass_serv=[7,8]), + FileTemplate(0x6fd5, 'EF.GBABP', 'TR', None, None, 5, None, 'FF...FF', False, ['size'], ass_serv=[2]), + FileTemplate(0x6fd7, 'EF.GBANL', 'LF', None, None, 2, None, 'FF...FF', False, ['nb_rec','size'], ass_serv=[2]), + FileTemplate(0x6fdd, 'EF.NAFKCA', 'LF', None, None, 2, None, 'FF...FF', False, ['nb_rec','size'], ass_serv=[2,4]), + FileTemplate(0x6fe7, 'EF.UICCIARI', 'LF', None, None, 2, None, None, True, ['nb_rec','size'], ass_serv=[10]), + ] + + +# Section 9.6.2 +class FilesIsimOptionalv2(ProfileTemplate): + created_by_default = False + oid = [2, 23, 143, 1, 2, 9, 2] + 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]), + FileTemplate(0x6f42, 'EF.SMSP', 'LF', 1, 38, 5, None, 'FF...FF', False, ass_serv=[8]), + FileTemplate(0x6f43, 'EF.SMSS', 'TR', None, 2, 5, None, 'FFFF', False, ass_serv=[6,8]), + FileTemplate(0x6f47, 'EF.SMSR', 'LF', 10, 30, 5, None, '00FF...FF', False, ass_serv=[7,8]), + FileTemplate(0x6fd5, 'EF.GBABP', 'TR', None, None, 5, None, 'FF...FF', False, ['size'], ass_serv=[2]), + FileTemplate(0x6fd7, 'EF.GBANL', 'LF', None, None, 2, None, 'FF...FF', False, ['nb_rec','size'], ass_serv=[2]), + FileTemplate(0x6fdd, 'EF.NAFKCA', 'LF', None, None, 2, None, 'FF...FF', False, ['nb_rec','size'], ass_serv=[2,4]), + FileTemplate(0x6fe7, 'EF.UICCIARI', 'LF', None, None, 2, None, None, True, ['nb_rec','size'], ass_serv=[10]), + FileTemplate(0x6ff7, 'EF.FromPreferred','TR', None, 1, 2, None, '00', False, ass_serv=[17]), + FileTemplate(0x6ff8, 'EF.ImsConfigData','BT', None,None, 2, None, None, True, ['size'], ass_serv=[18]), + FileTemplate(0x6ffc, 'EF.XcapconfigData','BT',None,None, 2, None, None, True, ['size'], ass_serv=[19]), + FileTemplate(0x6ffa, 'EF.WebRTCURI', 'LF', None, None, 2, None, None, True, ['nb_rec', 'size'], ass_serv=[20]), + FileTemplate(0x6ffa, 'EF.MudMidCfgData','BT',None, None, 2, None, None, True, ['size'], ass_serv=[21]), + ] + + +# TODO: CSIM + + +# Section 9.8 +class FilesEap(ProfileTemplate): + created_by_default = False + oid = [2, 23, 143, 1, 2, 12] + files = [ + FileTemplate( None, 'DF.EAP', 'DF', None, None, 14, None, None, False, ['fid','pinStatusTemplateDO'], ass_serv=[(124, 125)]), + FileTemplate(0x4f01, 'EF.EAPKEYS', 'TR', None, None, 2, None, None, True, ['size'], high_update=True), + FileTemplate(0x4f02, 'EF.EAPSTATUS', 'TR', None, 1, 2, None, '00', False, high_update=True), + FileTemplate(0x4f03, 'EF.PUId', 'TR', None, None, 2, None, None, True, ['size']), + FileTemplate(0x4f04, 'EF.Ps', 'TR', None, None, 5, None, 'FF..FF', False, ['size'], high_update=True), + FileTemplate(0x4f20, 'EF.CurID', 'TR', None, None, 5, None, 'FF..FF', False, ['size'], high_update=True), + FileTemplate(0x4f21, 'EF.RelID', 'TR', None, None, 5, None, None, True, ['size']), + FileTemplate(0x4f22, 'EF.Realm', 'TR', None, None, 5, None, None, True, ['size']), + ] + + +# Section 9.9 Access Rules Definition +ARR_DEFINITION = { + 1: ['8001019000', '800102A406830101950108', '800158A40683010A950108'], + 2: ['800101A406830101950108', '80015AA40683010A950108'], + 3: ['80015BA40683010A950108'], + 4: ['8001019000', '80011A9700', '800140A40683010A950108'], + 5: ['800103A406830101950108', '800158A40683010A950108'], + 6: ['800111A406830101950108', '80014AA40683010A950108'], + 7: ['800103A406830101950108', '800158A40683010A950108', '840132A406830101950108'], + 8: ['800101A406830101950108', '800102A406830181950108', '800158A40683010A950108'], + 9: ['8001019000', '80011AA406830101950108', '800140A40683010A950108'], + 10: ['8001019000', '80015AA40683010A950108'], + 11: ['8001019000', '800118A40683010A950108', '8001429700'], + 12: ['800101A406830101950108', '80015A9700'], + 13: ['800113A406830101950108', '800148A40683010A950108'], + 14: ['80015EA40683010A950108'], +} -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35731?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I79bc0a480450ca2de4b687ba6f11d0a4ea4f14c8 Gerrit-Change-Number: 35731 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[S] Change in libosmocore[master]: tests/Makefile.am: do not add files to EXTRA_DIST conditionally

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35728?usp=email ) Change subject: tests/Makefile.am: do not add files to EXTRA_DIST conditionally ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35728?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8f530d6157b00907dd1b438100bb0fb300dfcd22 Gerrit-Change-Number: 35728 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 28 Jan 2024 19:42:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-trx[master]: doc/examples: fix missing config files in release tarballs

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/35727?usp=email ) Change subject: doc/examples: fix missing config files in release tarballs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/35727?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iffb6d7577de175fc5d14642f0af6852508d74e69 Gerrit-Change-Number: 35727 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 28 Jan 2024 19:41:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: doc/examples: fix missing config files in release tarballs

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35726?usp=email ) Change subject: doc/examples: fix missing config files in release tarballs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35726?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I167027afde3cee40a3b52adfaec7bde91ba896da Gerrit-Change-Number: 35726 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 28 Jan 2024 19:41:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in libosmocore[master]: osmo-release.sh: make it a bit more user friendly

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35725?usp=email ) Change subject: osmo-release.sh: make it a bit more user friendly ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File osmo-release.sh: https://gerrit.osmocom.org/c/libosmocore/+/35725/comment/0e55e4aa_8ce0df92 PS1, Line 240: echo "After making changes, add modified file(s) to the index using git-add." "using git-add and try again"? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35725?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8574cb00de820ab477eb5c4abd05d8e546ca89cc Gerrit-Change-Number: 35725 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 28 Jan 2024 19:30:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in libosmo-abis[master]: Bump version: 1.5.0.5-aa34 → 1.5.1

by pespin

Attention is currently required from: fixeria, laforge, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/35720?usp=email ) Change subject: Bump version: 1.5.0.5-aa34 → 1.5.1 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/35720?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I88b987d714a88728b62f74a60c44d9c3532b5686 Gerrit-Change-Number: 35720 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 28 Jan 2024 19:29:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in libosmocore[master]: Add logging category for libosmo-cc

by jolly

jolly has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35572?usp=email ) Change subject: Add logging category for libosmo-cc ...................................................................... Abandoned libosmo-cc does not need libosmocore's logging category anymore. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35572?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9df433b2cfb51f04dbf16e9f8dee567a59ab5cb7 Gerrit-Change-Number: 35572 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

3 months, 1 week

1
0
0 0

[S] Change in libosmocore[master]: tests/Makefile.am: do not add files to EXTRA_DIST conditionally

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35728?usp=email ) Change subject: tests/Makefile.am: do not add files to EXTRA_DIST conditionally ...................................................................... tests/Makefile.am: do not add files to EXTRA_DIST conditionally These files must be present in the release tarballs regardless of the configure options (ENABLE_LIBSCTP, ENABLE_SCTP_TESTS). Change-Id: I8f530d6157b00907dd1b438100bb0fb300dfcd22 Related: OS#6349 --- M tests/Makefile.am 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/28/35728/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 5042b3c..7c109a1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -504,11 +504,11 @@ osmo_io/osmo_io_test.ok osmo_io/osmo_io_test.err \ soft_uart/soft_uart_test.ok \ rlp/rlp_test.ok \ + socket/socket_sctp_test.ok socket/socket_sctp_test.err \ $(NULL) if ENABLE_LIBSCTP if ENABLE_SCTP_TESTS -EXTRA_DIST += socket/socket_sctp_test.ok socket/socket_sctp_test.err check_PROGRAMS += socket/socket_sctp_test socket_socket_sctp_test_SOURCES = socket/socket_sctp_test.c endif -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35728?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8f530d6157b00907dd1b438100bb0fb300dfcd22 Gerrit-Change-Number: 35728 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[S] Change in osmo-trx[master]: doc/examples: fix missing config files in release tarballs

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/35727?usp=email ) Change subject: doc/examples: fix missing config files in release tarballs ...................................................................... doc/examples: fix missing config files in release tarballs All config file examples must be listed in EXTRA_DIST unconditionally. Adding them conditionally results in incomplete release tarballs, containing only some '*.cfg' files and failing to build. Change-Id: Iffb6d7577de175fc5d14642f0af6852508d74e69 Related: OS#6349 --- M doc/examples/Makefile.am 1 file changed, 26 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/27/35727/1 diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 0b06130..ac87457 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,3 +1,15 @@ +# all config examples must be listed here unconditionally, so that +# all of them end up in the release tarball (see OS#6349) +EXTRA_DIST = \ + osmo-trx-uhd/osmo-trx-limesdr.cfg \ + osmo-trx-uhd/osmo-trx-usrp_b200.cfg \ + osmo-trx-uhd/osmo-trx-uhd.cfg \ + osmo-trx-uhd/osmo-trx-umtrx.cfg \ + osmo-trx-lms/osmo-trx-limesdr.cfg \ + osmo-trx-lms/osmo-trx-lms.cfg \ + osmo-trx-ipc/osmo-trx-ipc.cfg \ + $(NULL) + OSMOCONF_FILES = osmoconfdir = $(sysconfdir)/osmocom @@ -19,7 +31,6 @@ endif osmoconf_DATA = $(OSMOCONF_FILES) -EXTRA_DIST = $(OSMOCONF_FILES) CFG_FILES = find $(srcdir) -type f -name '*.cfg*' | sed -e 's,^$(srcdir),,' -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/35727?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iffb6d7577de175fc5d14642f0af6852508d74e69 Gerrit-Change-Number: 35727 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: doc/examples: fix missing config files in release tarballs

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/35726?usp=email ) Change subject: doc/examples: fix missing config files in release tarballs ...................................................................... doc/examples: fix missing config files in release tarballs All config file examples must be listed in EXTRA_DIST unconditionally. Adding them conditionally results in incomplete release tarballs, containing only 'osmo-bts-virtual.cfg' and failing to build. Change-Id: I167027afde3cee40a3b52adfaec7bde91ba896da Related: OS#6349 --- M doc/examples/Makefile.am 1 file changed, 30 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/26/35726/1 diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 25a2151..6a1ae95 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,16 +1,29 @@ -OSMOCONF_FILES = virtual/osmo-bts-virtual.cfg +# all config examples must be listed here unconditionally, so that +# all of them end up in the release tarball (see OS#6349) +EXTRA_DIST = \ + trx/osmo-bts-trx.cfg \ + trx/osmo-bts-trx-calypso.cfg \ + octphy/osmo-bts-trx2dsp1.cfg \ + octphy/osmo-bts-octphy.cfg \ + oc2g/osmo-bts-oc2g.cfg \ + oc2g/oc2gbts-mgr.cfg \ + sysmo/sysmobts-mgr.cfg \ + sysmo/osmo-bts-sysmo.cfg \ + litecell15/osmo-bts-lc15.cfg \ + litecell15/lc15bts-mgr.cfg \ + virtual/osmo-bts-virtual.cfg \ + $(NULL) doc_virtualdir = $(docdir)/examples/osmo-bts-virtual doc_virtual_DATA = \ virtual/osmo-bts-virtual.cfg -EXTRA_DIST = $(doc_virtual_DATA) +OSMOCONF_FILES = virtual/osmo-bts-virtual.cfg if ENABLE_SYSMOBTS doc_sysmodir = $(docdir)/examples/osmo-bts-sysmo doc_sysmo_DATA = \ sysmo/osmo-bts-sysmo.cfg \ sysmo/sysmobts-mgr.cfg -EXTRA_DIST += $(doc_sysmo_DATA) OSMOCONF_FILES += sysmo/osmo-bts-sysmo.cfg sysmo/sysmobts-mgr.cfg endif @@ -19,7 +32,6 @@ doc_trx_DATA = \ trx/osmo-bts-trx.cfg \ trx/osmo-bts-trx-calypso.cfg -EXTRA_DIST += $(doc_trx_DATA) OSMOCONF_FILES += trx/osmo-bts-trx.cfg endif @@ -28,7 +40,6 @@ doc_octphy_DATA = \ octphy/osmo-bts-trx2dsp1.cfg \ octphy/osmo-bts-octphy.cfg -EXTRA_DIST += $(doc_octphy_DATA) OSMOCONF_FILES += octphy/osmo-bts-octphy.cfg endif @@ -37,7 +48,6 @@ doc_lc15_DATA = \ litecell15/osmo-bts-lc15.cfg \ litecell15/lc15bts-mgr.cfg -EXTRA_DIST += $(doc_lc15_DATA) OSMOCONF_FILES += litecell15/osmo-bts-lc15.cfg litecell15/lc15bts-mgr.cfg endif @@ -46,7 +56,6 @@ doc_oc2g_DATA = \ oc2g/osmo-bts-oc2g.cfg \ oc2g/oc2gbts-mgr.cfg -EXTRA_DIST += $(doc_oc2g_DATA) OSMOCONF_FILES += oc2g/osmo-bts-oc2g.cfg oc2g/oc2gbts-mgr.cfg endif -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35726?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I167027afde3cee40a3b52adfaec7bde91ba896da Gerrit-Change-Number: 35726 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[S] Change in libosmo-abis[master]: Bump version: 1.5.0.5-aa34 → 1.5.1

by fixeria

Attention is currently required from: laforge, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/35720?usp=email ) Change subject: Bump version: 1.5.0.5-aa34 → 1.5.1 ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > (The link you shared describes the versioning scheme, but does not define the rules. […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/35720?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I88b987d714a88728b62f74a60c44d9c3532b5686 Gerrit-Change-Number: 35720 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 28 Jan 2024 11:05:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in libosmo-abis[master]: Bump version: 1.5.0.5-aa34 → 1.5.1

by fixeria

Attention is currently required from: laforge, osmith, pespin. Hello Jenkins Builder, laforge, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/35720?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: Bump version: 1.5.0.5-aa34 → 1.5.1 ...................................................................... Bump version: 1.5.0.5-aa34 → 1.5.1 Change-Id: I88b987d714a88728b62f74a60c44d9c3532b5686 --- M debian/changelog M src/Makefile.am 2 files changed, 26 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/20/35720/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/35720?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I88b987d714a88728b62f74a60c44d9c3532b5686 Gerrit-Change-Number: 35720 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 months, 1 week

1
0
0 0

[S] Change in libosmocore[master]: osmo-release.sh: make it a bit more user friendly

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35725?usp=email ) Change subject: osmo-release.sh: make it a bit more user friendly ...................................................................... osmo-release.sh: make it a bit more user friendly Change-Id: I8574cb00de820ab477eb5c4abd05d8e546ca89cc --- M osmo-release.sh 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/35725/1 diff --git a/osmo-release.sh b/osmo-release.sh index 5f31c5f..e947fe4 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -235,7 +235,9 @@ if [ "z$LIBVERS" != "z" ]; then if [ "z$MAKEMOD" = "z" ] && [ "z$ALLOW_NO_LIBVERSION_CHANGE" = "z0" ]; then - echo "ERROR: Before releasing, please modify some of the libversions: $LIBVERS" + echo "ERROR: Before releasing, please modify some of the libversions:" + for l in $LIBVERS; do echo " $l"; done + echo "After making changes, add modified file(s) to the index using git-add." echo "You should NOT be doing this unless you've read and understood following article:" echo "https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info…" exit 1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35725?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8574cb00de820ab477eb5c4abd05d8e546ca89cc Gerrit-Change-Number: 35725 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[S] Change in libosmo-abis[master]: Bump version: 1.5.0.5-aa34 → 1.5.1

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/35720?usp=email ) Change subject: Bump version: 1.5.0.5-aa34 → 1.5.1 ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Please, read https://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning. […] (The link you shared describes the versioning scheme, but does not define the rules. I found them here: https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info…). Even though the library interfaces have not been changed so far, we still need to increment the `revision` according to 7.3 4) "If the library source code has changed at all since the last update ...". I will update the patch. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/35720?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I88b987d714a88728b62f74a60c44d9c3532b5686 Gerrit-Change-Number: 35720 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 28 Jan 2024 10:42:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in libosmo-abis[master]: Bump version: 1.5.0.5-aa34 → 1.5.1

by pespin

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/35720?usp=email ) Change subject: Bump version: 1.5.0.5-aa34 → 1.5.1 ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > AFAICT, we did not add/modify API since the last release. […] Please, read https://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.ht…, you still need to update the revision field. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/35720?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I88b987d714a88728b62f74a60c44d9c3532b5686 Gerrit-Change-Number: 35720 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 27 Jan 2024 22:11:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: ara_m: Permit encoding of empty AID (--aid '') in ARA-M rules

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35721?usp=email ) Change subject: ara_m: Permit encoding of empty AID (--aid '') in ARA-M rules ...................................................................... ara_m: Permit encoding of empty AID (--aid '') in ARA-M rules Encoding an empty AID-REF-DO (4F) is neccessary to achieve the meaning described in "Secure Element Access Control - Public Release v1.0" Table 6-1: "Empty: Indicates that the rules to be stored or retrieved are associated with all SE applications not covered by a specific rule". Change-Id: Iac6c3d78bc9ce36bac47589e5f7a0cc78e2efc38 --- M pySim/ara_m.py 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/ara_m.py b/pySim/ara_m.py index 68244d1..f05109b 100644 --- a/pySim/ara_m.py +++ b/pySim/ara_m.py @@ -348,7 +348,7 @@ """Perform STORE DATA [Command-Store-REF-AR-DO] to store a (new) access rule.""" # REF ref_do_content = [] - if opts.aid: + if opts.aid != None: ref_do_content += [{'aid_ref_do': opts.aid}] elif opts.aid_empty: ref_do_content += [{'aid_ref_empty_do': None}] -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35721?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iac6c3d78bc9ce36bac47589e5f7a0cc78e2efc38 Gerrit-Change-Number: 35721 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: ara_m: Use GlobalPlatform SELECT decoding

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35722?usp=email ) Change subject: ara_m: Use GlobalPlatform SELECT decoding ...................................................................... ara_m: Use GlobalPlatform SELECT decoding As the ARA-M applet is a GlobalPlatform applet, its SELECT response decoding should be used, not the ETSI EUICC TS 102 221 fall-back. Change-Id: I1a30b88a385f6de663aa837483dd32c0d104856f --- M pySim/ara_m.py 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/ara_m.py b/pySim/ara_m.py index f05109b..a2eaa33 100644 --- a/pySim/ara_m.py +++ b/pySim/ara_m.py @@ -31,6 +31,7 @@ from pySim.construct import * from pySim.filesystem import * from pySim.tlv import * +import pySim.global_platform # various BER-TLV encoded Data Objects (DOs) @@ -259,6 +260,9 @@ files = [] self.add_files(files) + def decode_select_response(self, data_hex): + return pySim.global_platform.decode_select_response(data_hex) + @staticmethod def xceive_apdu_tlv(tp, hdr: Hexstr, cmd_do, resp_cls, exp_sw='9000'): """Transceive an APDU with the card, transparently encoding the command data from TLV -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35722?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1a30b88a385f6de663aa837483dd32c0d104856f Gerrit-Change-Number: 35722 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: runtime: Reset selected_file_fcp[_hex] if SELECT returns no data

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35723?usp=email ) Change subject: runtime: Reset selected_file_fcp[_hex] if SELECT returns no data ...................................................................... runtime: Reset selected_file_fcp[_hex] if SELECT returns no data In case SELECT doesn't return any response data, we must reset the lchan.selected_file_fcp* members to None to prevent pySim-shell preventing stale data from the previously selected file. Change-Id: Ia04b8634e328e604e8df7e8d59b7fd532242d2ca --- M pySim/runtime.py 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/runtime.py b/pySim/runtime.py index f836ec8..3aeaab1 100644 --- a/pySim/runtime.py +++ b/pySim/runtime.py @@ -304,6 +304,9 @@ if select_resp_data: self.selected_file_fcp_hex = select_resp_data self.selected_file_fcp = self.selected_file.decode_select_response(select_resp_data) + else: + self.selected_file_fcp_hex = None + self.selected_file_fcp = None # register commands of new file if cmd_app and self.selected_file.shell_commands: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35723?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia04b8634e328e604e8df7e8d59b7fd532242d2ca Gerrit-Change-Number: 35723 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: [cosmetic] ara_m: Give a spec reference for the PERM-AR-DO

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35724?usp=email ) Change subject: [cosmetic] ara_m: Give a spec reference for the PERM-AR-DO ...................................................................... [cosmetic] ara_m: Give a spec reference for the PERM-AR-DO PERM-AR-DO actually originates in a different spec than all other parts of the ara_m.py, so let's explicitly mention that. Change-Id: I6e0014c323f605860d0f70cd0c04d7e461e8a9de --- M pySim/ara_m.py 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ara_m.py b/pySim/ara_m.py index a2eaa33..d137dcf 100644 --- a/pySim/ara_m.py +++ b/pySim/ara_m.py @@ -116,6 +116,7 @@ class PermArDO(BER_TLV_IE, tag=0xdb): # Android UICC Carrier Privileges specific extension, see https://source.android.com/devices/tech/config/uicc + # based on Table 6-8 of GlobalPlatform Device API Access Control v1.0 _construct = Struct('permissions'/HexAdapter(Bytes(8))) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35724?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6e0014c323f605860d0f70cd0c04d7e461e8a9de Gerrit-Change-Number: 35724 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: runtime: Reset selected_file_fcp[_hex] if SELECT returns no data

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35723?usp=email ) Change subject: runtime: Reset selected_file_fcp[_hex] if SELECT returns no data ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35723?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia04b8634e328e604e8df7e8d59b7fd532242d2ca Gerrit-Change-Number: 35723 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sat, 27 Jan 2024 20:50:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: ara_m: Use GlobalPlatform SELECT decoding

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35722?usp=email ) Change subject: ara_m: Use GlobalPlatform SELECT decoding ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35722?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1a30b88a385f6de663aa837483dd32c0d104856f Gerrit-Change-Number: 35722 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sat, 27 Jan 2024 20:50:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: ara_m: Permit encoding of empty AID (--aid '') in ARA-M rules

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35721?usp=email ) Change subject: ara_m: Permit encoding of empty AID (--aid '') in ARA-M rules ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35721?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iac6c3d78bc9ce36bac47589e5f7a0cc78e2efc38 Gerrit-Change-Number: 35721 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sat, 27 Jan 2024 20:50:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: [cosmetic] ara_m: Give a spec reference for the PERM-AR-DO

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35724?usp=email ) Change subject: [cosmetic] ara_m: Give a spec reference for the PERM-AR-DO ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35724?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6e0014c323f605860d0f70cd0c04d7e461e8a9de Gerrit-Change-Number: 35724 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sat, 27 Jan 2024 20:50:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: ara_m: Permit encoding of empty AID (--aid '') in ARA-M rules

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35721?usp=email ) Change subject: ara_m: Permit encoding of empty AID (--aid '') in ARA-M rules ...................................................................... ara_m: Permit encoding of empty AID (--aid '') in ARA-M rules Encoding an empty AID-REF-DO (4F) is neccessary to achieve the meaning described in "Secure Element Access Control - Public Release v1.0" Table 6-1: "Empty: Indicates that the rules to be stored or retrieved are associated with all SE applications not covered by a specific rule". Change-Id: Iac6c3d78bc9ce36bac47589e5f7a0cc78e2efc38 --- M pySim/ara_m.py 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/21/35721/1 diff --git a/pySim/ara_m.py b/pySim/ara_m.py index 68244d1..f05109b 100644 --- a/pySim/ara_m.py +++ b/pySim/ara_m.py @@ -348,7 +348,7 @@ """Perform STORE DATA [Command-Store-REF-AR-DO] to store a (new) access rule.""" # REF ref_do_content = [] - if opts.aid: + if opts.aid != None: ref_do_content += [{'aid_ref_do': opts.aid}] elif opts.aid_empty: ref_do_content += [{'aid_ref_empty_do': None}] -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35721?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iac6c3d78bc9ce36bac47589e5f7a0cc78e2efc38 Gerrit-Change-Number: 35721 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: ara_m: Use GlobalPlatform SELECT decoding

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35722?usp=email ) Change subject: ara_m: Use GlobalPlatform SELECT decoding ...................................................................... ara_m: Use GlobalPlatform SELECT decoding As the ARA-M applet is a GlobalPlatform applet, its SELECT response decoding should be used, not the ETSI EUICC TS 102 221 fall-back. Change-Id: I1a30b88a385f6de663aa837483dd32c0d104856f --- M pySim/ara_m.py 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/22/35722/1 diff --git a/pySim/ara_m.py b/pySim/ara_m.py index f05109b..a2eaa33 100644 --- a/pySim/ara_m.py +++ b/pySim/ara_m.py @@ -31,6 +31,7 @@ from pySim.construct import * from pySim.filesystem import * from pySim.tlv import * +import pySim.global_platform # various BER-TLV encoded Data Objects (DOs) @@ -259,6 +260,9 @@ files = [] self.add_files(files) + def decode_select_response(self, data_hex): + return pySim.global_platform.decode_select_response(data_hex) + @staticmethod def xceive_apdu_tlv(tp, hdr: Hexstr, cmd_do, resp_cls, exp_sw='9000'): """Transceive an APDU with the card, transparently encoding the command data from TLV -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35722?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1a30b88a385f6de663aa837483dd32c0d104856f Gerrit-Change-Number: 35722 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: [cosmetic] ara_m: Give a spec reference for the PERM-AR-DO

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35724?usp=email ) Change subject: [cosmetic] ara_m: Give a spec reference for the PERM-AR-DO ...................................................................... [cosmetic] ara_m: Give a spec reference for the PERM-AR-DO PERM-AR-DO actually originates in a different spec than all other parts of the ara_m.py, so let's explicitly mention that. Change-Id: I6e0014c323f605860d0f70cd0c04d7e461e8a9de --- M pySim/ara_m.py 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/24/35724/1 diff --git a/pySim/ara_m.py b/pySim/ara_m.py index a2eaa33..7631d07 100644 --- a/pySim/ara_m.py +++ b/pySim/ara_m.py @@ -116,6 +116,7 @@ class PermArDO(BER_TLV_IE, tag=0xdb): # Android UICC Carrier Privileges specific extension, see https://source.android.com/devices/tech/config/uicc + # based on Table 6-8 of GlobalPlatfomr Device API Access Control v1.0 _construct = Struct('permissions'/HexAdapter(Bytes(8))) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35724?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6e0014c323f605860d0f70cd0c04d7e461e8a9de Gerrit-Change-Number: 35724 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: runtime: Reset selected_file_fcp[_hex] if SELECT returns no data

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35723?usp=email ) Change subject: runtime: Reset selected_file_fcp[_hex] if SELECT returns no data ...................................................................... runtime: Reset selected_file_fcp[_hex] if SELECT returns no data In case SELECT doesn't return any response data, we must reset the lchan.selected_file_fcp* members to None to prevent pySim-shell preventing stale data from the previously selected file. Change-Id: Ia04b8634e328e604e8df7e8d59b7fd532242d2ca --- M pySim/runtime.py 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/23/35723/1 diff --git a/pySim/runtime.py b/pySim/runtime.py index f836ec8..3aeaab1 100644 --- a/pySim/runtime.py +++ b/pySim/runtime.py @@ -304,6 +304,9 @@ if select_resp_data: self.selected_file_fcp_hex = select_resp_data self.selected_file_fcp = self.selected_file.decode_select_response(select_resp_data) + else: + self.selected_file_fcp_hex = None + self.selected_file_fcp = None # register commands of new file if cmd_app and self.selected_file.shell_commands: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35723?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia04b8634e328e604e8df7e8d59b7fd532242d2ca Gerrit-Change-Number: 35723 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 months, 2 weeks

1
0
0 0

[S] Change in libosmo-abis[master]: Bump version: 1.5.0.5-aa34 → 1.5.1

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/35720?usp=email ) Change subject: Bump version: 1.5.0.5-aa34 → 1.5.1 ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > You are missing updating the revision (middle field) in LIBVERSION for both libraries: […] AFAICT, we did not add/modify API since the last release. Shall I still bump those? -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/35720?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I88b987d714a88728b62f74a60c44d9c3532b5686 Gerrit-Change-Number: 35720 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 27 Jan 2024 18:43:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 months, 2 weeks

1
0
0 0

[M] Change in osmo-mgw[master]: Convert README to README.md and expand like in other projects

by pespin

Attention is currently required from: daniel, fixeria, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35718?usp=email ) Change subject: Convert README to README.md and expand like in other projects ...................................................................... Patch Set 2: (1 comment) File README.md: https://gerrit.osmocom.org/c/osmo-mgw/+/35718/comment/a504d852_2cafe0c9 PS1, Line 9: The OsmoMGW program exposes an MGCP interface towards a MGPC call agent > I am certainly not an expert in English grammar, but I think it should be `an` because `M` in `MGCP` […] Ack, I remember discussuing and looking at it previously with Daniel and it seems the sound is the one actually marking whether it's "an" or "n", not the letter. since MGCP is pronunced EM... hence a vowel sound, it should use "an". -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35718?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id9a78ccc0d10f0e3a9d832ac4c4988cfbb8ddb3c Gerrit-Change-Number: 35718 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Sat, 27 Jan 2024 18:32:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

3 months, 2 weeks

1
0
0 0

[S] Change in libosmo-abis[master]: Bump version: 1.5.0.5-aa34 → 1.5.1

by pespin

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/35720?usp=email ) Change subject: Bump version: 1.5.0.5-aa34 → 1.5.1 ...................................................................... Patch Set 1: Code-Review-2 (1 comment) Patchset: PS1: You are missing updating the revision (middle field) in LIBVERSION for both libraries: ABIS_LIBVERSION=13:1:0 TRAU_LIBVERSION=9:1:7 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/35720?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I88b987d714a88728b62f74a60c44d9c3532b5686 Gerrit-Change-Number: 35720 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 27 Jan 2024 18:30:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 2 weeks

1
0
0 0

[M] Change in osmo-mgw[master]: Convert README to README.md and expand like in other projects

by fixeria

Attention is currently required from: daniel, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35718?usp=email ) Change subject: Convert README to README.md and expand like in other projects ...................................................................... Patch Set 2: (1 comment) File README.md: https://gerrit.osmocom.org/c/osmo-mgw/+/35718/comment/03384690_72d38d42 PS1, Line 9: The OsmoMGW program exposes an MGCP interface towards a MGPC call agent > I intentionally switched all 'an' to 'a' since M is not a vowel? I am certainly not an expert in English grammar, but I think it should be `an` because `M` in `MGCP` acronym, while being not a vowel, is a _vowel sound_ `em`. This is not the case if you automatically expand the acronyms when reading them ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35718?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id9a78ccc0d10f0e3a9d832ac4c4988cfbb8ddb3c Gerrit-Change-Number: 35718 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 26 Jan 2024 21:21:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

3 months, 2 weeks

1
0
0 0

[M] Change in osmo-mgw[master]: Convert README to README.md and expand like in other projects

by laforge

Attention is currently required from: daniel, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35718?usp=email ) Change subject: Convert README to README.md and expand like in other projects ...................................................................... Patch Set 2: (2 comments) File README.md: https://gerrit.osmocom.org/c/osmo-mgw/+/35718/comment/909b843e_b6f569d5 PS1, Line 9: The OsmoMGW program exposes an MGCP interface towards a MGPC call agent > AFAICS, not addressed: `s/a/an/`. I intentionally switched all 'an' to 'a' since M is not a vowel? File README.md: https://gerrit.osmocom.org/c/osmo-mgw/+/35718/comment/40f58cba_01f92034 PS2, Line 9: MGPC > wait, it's MGCP, right? Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35718?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id9a78ccc0d10f0e3a9d832ac4c4988cfbb8ddb3c Gerrit-Change-Number: 35718 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 26 Jan 2024 21:07:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

3 months, 2 weeks

1
0
0 0

[S] Change in libosmo-abis[master]: Bump version: 1.5.0.5-aa34 → 1.5.1

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/35720?usp=email ) Change subject: Bump version: 1.5.0.5-aa34 → 1.5.1 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/35720?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I88b987d714a88728b62f74a60c44d9c3532b5686 Gerrit-Change-Number: 35720 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 26 Jan 2024 21:07:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 2 weeks

1
0
0 0

[S] Change in libosmo-abis[rel-1.5.1]: Bump version: 1.5.0.5-aa34 → 1.5.1

by fixeria

fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/35719?usp=email ) Change subject: Bump version: 1.5.0.5-aa34 → 1.5.1 ...................................................................... Abandoned see https://gerrit.osmocom.org/c/libosmo-abis/+/35720 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/35719?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: rel-1.5.1 Gerrit-Change-Id: I88b987d714a88728b62f74a60c44d9c3532b5686 Gerrit-Change-Number: 35719 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon

3 months, 2 weeks

1
0
0 0

[S] Change in libosmo-abis[master]: Bump version: 1.5.0.5-aa34 → 1.5.1

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/35720?usp=email ) Change subject: Bump version: 1.5.0.5-aa34 → 1.5.1 ...................................................................... Bump version: 1.5.0.5-aa34 → 1.5.1 Change-Id: I88b987d714a88728b62f74a60c44d9c3532b5686 --- M debian/changelog 1 file changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/20/35720/1 diff --git a/debian/changelog b/debian/changelog index bddca01..347a2f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +libosmo-abis (1.5.1) unstable; urgency=medium + + [ Harald Welte ] + * dahdi: Log context (e1inpt_ts name) when opening timeslot devices + * dahdi: Fix compilation with ancient DAHDI + + [ Keith ] + * DAHDI: Log hexdump of TX at level DEBUG, not ERROR + + [ Vadim Yanitskiy ] + * trau/osmo_ortp: support building without OrtpMemoryFunctions API + * build: include git-version-gen into the release tarball + + -- Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> Sat, 27 Jan 2024 03:36:30 +0700 + libosmo-abis (1.5.0) unstable; urgency=medium [ Philipp Maier ] -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/35720?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I88b987d714a88728b62f74a60c44d9c3532b5686 Gerrit-Change-Number: 35720 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 months, 2 weeks

1
0
0 0

[S] Change in libosmo-abis[rel-1.5.1]: Bump version: 1.5.0.5-aa34 → 1.5.1

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/35719?usp=email ) Change subject: Bump version: 1.5.0.5-aa34 → 1.5.1 ...................................................................... Bump version: 1.5.0.5-aa34 → 1.5.1 Change-Id: I88b987d714a88728b62f74a60c44d9c3532b5686 --- M debian/changelog 1 file changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/19/35719/1 diff --git a/debian/changelog b/debian/changelog index bddca01..347a2f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +libosmo-abis (1.5.1) unstable; urgency=medium + + [ Harald Welte ] + * dahdi: Log context (e1inpt_ts name) when opening timeslot devices + * dahdi: Fix compilation with ancient DAHDI + + [ Keith ] + * DAHDI: Log hexdump of TX at level DEBUG, not ERROR + + [ Vadim Yanitskiy ] + * trau/osmo_ortp: support building without OrtpMemoryFunctions API + * build: include git-version-gen into the release tarball + + -- Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> Sat, 27 Jan 2024 03:36:30 +0700 + libosmo-abis (1.5.0) unstable; urgency=medium [ Philipp Maier ] -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/35719?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: rel-1.5.1 Gerrit-Change-Id: I88b987d714a88728b62f74a60c44d9c3532b5686 Gerrit-Change-Number: 35719 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 months, 2 weeks

1
0
0 0

2024

2023

2022

gerrit-log January 2024