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

[L] Change in pysim[master]: add test_configurable_parameters.py

by Jenkins Builder

Jenkins Builder has posted comments on this change by neels. ( https://gerrit.osmocom.org/c/pysim/+/40823?usp=email ) Change subject: add test_configurable_parameters.py ...................................................................... Patch Set 1: (1 comment) File pySim/esim/saip/personalization.py: Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/pysim/+/40823/comment/fd5952cf_4970d2c6?usp=em… : PS1, Line 230: where each occurence should reflect the same value (all currently known parameters). 'occurence' may be misspelled - perhaps 'occurrence'? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40823?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia55f0d11f8197ca15a948a83a34b3488acf1a0b4 Gerrit-Change-Number: 40823 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 04 Aug 2025 16:53:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 month

1
0
0 0

[S] Change in pysim[master]: personalization: add int as input type for BinaryParameter

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/40825?usp=email ) Change subject: personalization: add int as input type for BinaryParameter ...................................................................... personalization: add int as input type for BinaryParameter Change-Id: I31d8142cb0847a8b291f8dc614d57cb4734f0190 --- M pySim/esim/saip/personalization.py M tests/unittests/test_configurable_parameters.py 2 files changed, 47 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/25/40825/1 diff --git a/pySim/esim/saip/personalization.py b/pySim/esim/saip/personalization.py index 39f1cdf..216334d 100644 --- a/pySim/esim/saip/personalization.py +++ b/pySim/esim/saip/personalization.py @@ -356,13 +356,17 @@ class BinaryParam(ConfigurableParameter): - allow_types = (str, io.BytesIO, bytes, bytearray) + allow_types = (str, io.BytesIO, bytes, bytearray, int) allow_chars = '0123456789abcdefABCDEF' strip_chars = ' \t\r\n' @classmethod def validate_val(cls, val): # take care that min_len and max_len are applied to the binary length by converting to bytes first + if isinstance(val, int): + min_len, _max_len = cls.get_len_range() + val = '%0*d' % (min_len, val) + if isinstance(val, str): if cls.strip_chars is not None: val = ''.join(c for c in val if c not in cls.strip_chars) diff --git a/tests/unittests/test_configurable_parameters.py b/tests/unittests/test_configurable_parameters.py index c4e95ff..0237033 100755 --- a/tests/unittests/test_configurable_parameters.py +++ b/tests/unittests/test_configurable_parameters.py @@ -81,6 +81,10 @@ val='12345678', expect_clean_val=b'12345678', expect_val='12345678'), + Paramtest(param_cls=p13n.Puk1, + val=int(12345678), + expect_clean_val=b'12345678', + expect_val='12345678'), Paramtest(param_cls=p13n.Puk2, val='12345678', @@ -99,6 +103,18 @@ val='12345678', expect_clean_val=b'12345678', expect_val='12345678'), + Paramtest(param_cls=p13n.Pin1, + val=int(1234), + expect_clean_val=b'1234\xff\xff\xff\xff', + expect_val='1234'), + Paramtest(param_cls=p13n.Pin1, + val=int(123456), + expect_clean_val=b'123456\xff\xff', + expect_val='123456'), + Paramtest(param_cls=p13n.Pin1, + val=int(12345678), + expect_clean_val=b'12345678', + expect_val='12345678'), Paramtest(param_cls=p13n.Adm1, val='1234', @@ -112,6 +128,10 @@ val='12345678', expect_clean_val=b'12345678', expect_val='12345678'), + Paramtest(param_cls=p13n.Adm1, + val=int(123456), + expect_clean_val=b'123456\xff\xff', + expect_val='123456'), Paramtest(param_cls=p13n.AlgorithmID, val='Milenage', @@ -126,6 +146,19 @@ expect_clean_val=3, expect_val='usim-test'), + Paramtest(param_cls=p13n.AlgorithmID, + val=1, + expect_clean_val=1, + expect_val='Milenage'), + Paramtest(param_cls=p13n.AlgorithmID, + val=2, + expect_clean_val=2, + expect_val='TUAK'), + Paramtest(param_cls=p13n.AlgorithmID, + val=3, + expect_clean_val=3, + expect_val='usim-test'), + Paramtest(param_cls=p13n.K, val='01020304050607080910111213141516', expect_clean_val=b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16', @@ -142,6 +175,10 @@ val=io.BytesIO(b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16'), expect_clean_val=b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16', expect_val='01020304050607080910111213141516'), + Paramtest(param_cls=p13n.K, + val=int(11020304050607080910111213141516), + expect_clean_val=b'\x11\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16', + expect_val='11020304050607080910111213141516'), Paramtest(param_cls=p13n.Opc, val='01020304050607080910111213141516', @@ -233,6 +270,11 @@ expect_clean_val=b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16', expect_val='01020304050607080910111213141516', ), + Paramtest(param_cls=sdkey_cls, + val=11020304050607080910111213141516, + expect_clean_val=b'\x11\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16', + expect_val='11020304050607080910111213141516', + ), ]) for upp_fname in upp_fnames: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40825?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I31d8142cb0847a8b291f8dc614d57cb4734f0190 Gerrit-Change-Number: 40825 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>

1 month

1
0
0 0

[M] Change in pysim[master]: personalization: fix SdKey.apply_val() implementation

by neels

Attention is currently required from: neels. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/40203?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: personalization: fix SdKey.apply_val() implementation ...................................................................... personalization: fix SdKey.apply_val() implementation 'securityDomain' elements are decoded to ProfileElementSD instances, which keep higher level representations of the key data apart from the decoded[] lists. So far, apply_val() was dropping binary values in decoded[], which does not work, because ProfileElementSD._pre_encode() overwrites self.decoded[] from the higher level representation. Implement using - ProfileElementSD.find_key() and SecurityDomainKeyComponent to modify an exsiting entry, or - ProfileElementSD.add_key() to create a new entry. Before this patch, SdKey parameters seemed to patch PES successfully, but their modifications did not end up in the encoded DER. (BTW, this does not fix any other errors that may still be present in the various SdKey subclasses, patches coming up.) Related: SYS#6768 Change-Id: I07dfc378705eba1318e9e8652796cbde106c6a52 --- M pySim/esim/saip/__init__.py M pySim/esim/saip/personalization.py 2 files changed, 40 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/03/40203/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40203?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I07dfc378705eba1318e9e8652796cbde106c6a52 Gerrit-Change-Number: 40203 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>

1 month

1
0
0 0

[S] Change in pysim[master]: personalization.ConfigurableParameter: fix BytesIO() input

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/40824?usp=email ) Change subject: personalization.ConfigurableParameter: fix BytesIO() input ...................................................................... personalization.ConfigurableParameter: fix BytesIO() input Change-Id: I0ad160eef9015e76eef10baee7c6b606fe249123 --- M pySim/esim/saip/personalization.py M tests/unittests/test_configurable_parameters.py 2 files changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/24/40824/1 diff --git a/pySim/esim/saip/personalization.py b/pySim/esim/saip/personalization.py index 27b570c..39f1cdf 100644 --- a/pySim/esim/saip/personalization.py +++ b/pySim/esim/saip/personalization.py @@ -196,6 +196,9 @@ if cls.allow_chars is not None: if any(c not in cls.allow_chars for c in val): raise ValueError(f"invalid characters in input value {val!r}, valid chars are {cls.allow_chars}") + elif isinstance(val, io.BytesIO): + val = val.getvalue() + if cls.allow_len is not None: l = cls.allow_len # cls.allow_len could be one int, or a tuple of ints. Wrap a single int also in a tuple. diff --git a/tests/unittests/test_configurable_parameters.py b/tests/unittests/test_configurable_parameters.py index a1ca91b..c4e95ff 100755 --- a/tests/unittests/test_configurable_parameters.py +++ b/tests/unittests/test_configurable_parameters.py @@ -18,6 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. import unittest +import io from importlib import resources from osmocom.utils import hexstr from pySim.esim.saip import ProfileElementSequence @@ -137,6 +138,10 @@ val=bytearray(b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16'), expect_clean_val=b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16', expect_val='01020304050607080910111213141516'), + Paramtest(param_cls=p13n.K, + val=io.BytesIO(b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16'), + expect_clean_val=b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16', + expect_val='01020304050607080910111213141516'), Paramtest(param_cls=p13n.Opc, val='01020304050607080910111213141516', @@ -150,6 +155,10 @@ val=bytearray(b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16'), expect_clean_val=b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16', expect_val='01020304050607080910111213141516'), + Paramtest(param_cls=p13n.Opc, + val=io.BytesIO(b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16'), + expect_clean_val=b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16', + expect_val='01020304050607080910111213141516'), ] for sdkey_cls in ( @@ -219,6 +228,11 @@ expect_clean_val=b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16', expect_val='01020304050607080910111213141516', ), + Paramtest(param_cls=sdkey_cls, + val=io.BytesIO(b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16'), + expect_clean_val=b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16', + expect_val='01020304050607080910111213141516', + ), ]) for upp_fname in upp_fnames: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40824?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0ad160eef9015e76eef10baee7c6b606fe249123 Gerrit-Change-Number: 40824 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>

1 month

1
0
0 0

[L] Change in pysim[master]: add test_configurable_parameters.py

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/40823?usp=email ) Change subject: add test_configurable_parameters.py ...................................................................... add test_configurable_parameters.py Change-Id: Ia55f0d11f8197ca15a948a83a34b3488acf1a0b4 --- M pySim/esim/saip/personalization.py A tests/unittests/smdpp_data A tests/unittests/test_configurable_parameters.py 3 files changed, 319 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/23/40823/1 diff --git a/pySim/esim/saip/personalization.py b/pySim/esim/saip/personalization.py index e0cb97c..27b570c 100644 --- a/pySim/esim/saip/personalization.py +++ b/pySim/esim/saip/personalization.py @@ -219,6 +219,26 @@ pass @classmethod + def get_value_from_pes(cls, pes: ProfileElementSequence): + """Same as get_values_from_pes() but expecting a single value. + get_values_from_pes() may return values like this: + [{ 'AlgorithmID': 'Milenage' }, { 'AlgorithmID': 'Milenage' }] + This ensures that all these entries are identical and would return only + { 'AlgorithmID': 'Milenage' }. + + This is relevant for any profile element that may appear multiple times in the same PES (only a few), + where each occurence should reflect the same value (all currently known parameters). + """ + + val = None + for v in cls.get_values_from_pes(pes): + if val is None: + val = v + elif val != v: + raise ValueError(f'get_value_from_pes(): got distinct values: {val!r} != {v!r}') + return val + + @classmethod def get_values_from_pes(cls, pes: ProfileElementSequence) -> Generator: """This is what subclasses implement: yield all values from a decoded profile package. Find all values in the pes, and yield them decoded to a valid cls.input_value format. diff --git a/tests/unittests/smdpp_data b/tests/unittests/smdpp_data new file mode 120000 index 0000000..a2d60f8 --- /dev/null +++ b/tests/unittests/smdpp_data @@ -0,0 +1 @@ +../../smdpp-data \ No newline at end of file diff --git a/tests/unittests/test_configurable_parameters.py b/tests/unittests/test_configurable_parameters.py new file mode 100755 index 0000000..a1ca91b --- /dev/null +++ b/tests/unittests/test_configurable_parameters.py @@ -0,0 +1,298 @@ +#!/usr/bin/env python3 + +# (C) 2025 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +# +# Author: Neels Hofmeyr +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +import unittest +from importlib import resources +from osmocom.utils import hexstr +from pySim.esim.saip import ProfileElementSequence +import pySim.esim.saip.personalization as p13n +import smdpp_data.upp + +class D: + mandatory = set() + optional = set() + + def __init__(self, **kwargs): + if (set(kwargs.keys()) - set(self.optional)) != set(self.mandatory): + raise RuntimeError(f'{self.__class__.__name__}.__init__():' + f' {set(kwargs.keys())=!r} - {self.optional=!r} != {self.mandatory=!r}') + for k, v in kwargs.items(): + setattr(self, k, v) + for k in self.optional: + if not hasattr(self, k): + setattr(self, k, None) + +class ConfigurableParameterTest(unittest.TestCase): + + def test_parameters(self): + + upp_fnames = ( + 'TS48v5_SAIP2.1A_NoBERTLV.der', + 'TS48v5_SAIP2.3_BERTLV_SUCI.der', + 'TS48v5_SAIP2.1B_NoBERTLV.der', + 'TS48v5_SAIP2.3_NoBERTLV.der', + ) + + class Paramtest(D): + mandatory = ( + 'param_cls', + 'val', + 'expect_val', + ) + optional = ( + 'expect_clean_val', + ) + + param_tests = [ + Paramtest(param_cls=p13n.Imsi, val='123456', + expect_clean_val=str('123456'), + expect_val={'IMSI': hexstr('123456'), + 'IMSI-ACC': '0040'}), + Paramtest(param_cls=p13n.Imsi, val=int(123456), + expect_val={'IMSI': hexstr('123456'), + 'IMSI-ACC': '0040'}), + + Paramtest(param_cls=p13n.Imsi, val='123456789012345', + expect_clean_val=str('123456789012345'), + expect_val={'IMSI': hexstr('123456789012345'), + 'IMSI-ACC': '0020'}), + Paramtest(param_cls=p13n.Imsi, val=int(123456789012345), + expect_val={'IMSI': hexstr('123456789012345'), + 'IMSI-ACC': '0020'}), + + Paramtest(param_cls=p13n.Puk1, + val='12345678', + expect_clean_val=b'12345678', + expect_val='12345678'), + + Paramtest(param_cls=p13n.Puk2, + val='12345678', + expect_clean_val=b'12345678', + expect_val='12345678'), + + Paramtest(param_cls=p13n.Pin1, + val='1234', + expect_clean_val=b'1234\xff\xff\xff\xff', + expect_val='1234'), + Paramtest(param_cls=p13n.Pin1, + val='123456', + expect_clean_val=b'123456\xff\xff', + expect_val='123456'), + Paramtest(param_cls=p13n.Pin1, + val='12345678', + expect_clean_val=b'12345678', + expect_val='12345678'), + + Paramtest(param_cls=p13n.Adm1, + val='1234', + expect_clean_val=b'1234\xff\xff\xff\xff', + expect_val='1234'), + Paramtest(param_cls=p13n.Adm1, + val='123456', + expect_clean_val=b'123456\xff\xff', + expect_val='123456'), + Paramtest(param_cls=p13n.Adm1, + val='12345678', + expect_clean_val=b'12345678', + expect_val='12345678'), + + Paramtest(param_cls=p13n.AlgorithmID, + val='Milenage', + expect_clean_val=1, + expect_val='Milenage'), + Paramtest(param_cls=p13n.AlgorithmID, + val='TUAK', + expect_clean_val=2, + expect_val='TUAK'), + Paramtest(param_cls=p13n.AlgorithmID, + val='usim-test', + expect_clean_val=3, + expect_val='usim-test'), + + Paramtest(param_cls=p13n.K, + val='01020304050607080910111213141516', + expect_clean_val=b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16', + expect_val='01020304050607080910111213141516'), + Paramtest(param_cls=p13n.K, + val=b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16', + expect_clean_val=b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16', + expect_val='01020304050607080910111213141516'), + Paramtest(param_cls=p13n.K, + val=bytearray(b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16'), + expect_clean_val=b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16', + expect_val='01020304050607080910111213141516'), + + Paramtest(param_cls=p13n.Opc, + val='01020304050607080910111213141516', + expect_clean_val=b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16', + expect_val='01020304050607080910111213141516'), + Paramtest(param_cls=p13n.Opc, + val=b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16', + expect_clean_val=b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16', + expect_val='01020304050607080910111213141516'), + Paramtest(param_cls=p13n.Opc, + val=bytearray(b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16'), + expect_clean_val=b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16', + expect_val='01020304050607080910111213141516'), + ] + + for sdkey_cls in ( + p13n.SdKeyScp80Kvn01Enc, + p13n.SdKeyScp80Kvn01Dek, + p13n.SdKeyScp80Kvn01Mac, + p13n.SdKeyScp80Kvn02Enc, + p13n.SdKeyScp80Kvn02Dek, + p13n.SdKeyScp80Kvn02Mac, + p13n.SdKeyScp81Kvn81Enc, + p13n.SdKeyScp81Kvn81Dek, + p13n.SdKeyScp81Kvn81Mac, + p13n.SdKeyScp81Kvn82Enc, + p13n.SdKeyScp81Kvn82Dek, + p13n.SdKeyScp81Kvn82Mac, + p13n.SdKeyScp81Kvn83Enc, + p13n.SdKeyScp81Kvn83Dek, + p13n.SdKeyScp81Kvn83Mac, + p13n.SdKeyScp02Kvn20Enc, + p13n.SdKeyScp02Kvn20Dek, + p13n.SdKeyScp02Kvn20Mac, + p13n.SdKeyScp02Kvn21Enc, + p13n.SdKeyScp02Kvn21Dek, + p13n.SdKeyScp02Kvn21Mac, + p13n.SdKeyScp02Kvn22Enc, + p13n.SdKeyScp02Kvn22Dek, + p13n.SdKeyScp02Kvn22Mac, + p13n.SdKeyScp02KvnffEnc, + p13n.SdKeyScp02KvnffDek, + p13n.SdKeyScp02KvnffMac, + p13n.SdKeyScp03Kvn30Enc, + p13n.SdKeyScp03Kvn30Dek, + p13n.SdKeyScp03Kvn30Mac, + p13n.SdKeyScp03Kvn31Enc, + p13n.SdKeyScp03Kvn31Dek, + p13n.SdKeyScp03Kvn31Mac, + p13n.SdKeyScp03Kvn32Enc, + p13n.SdKeyScp03Kvn32Dek, + p13n.SdKeyScp03Kvn32Mac, + ): + + param_tests.extend([ + + Paramtest(param_cls=sdkey_cls, + val='01020304050607080910111213141516', + expect_clean_val=b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16', + expect_val='01020304050607080910111213141516', + ), + Paramtest(param_cls=sdkey_cls, + val='010203040506070809101112131415161718192021222324', + expect_clean_val=b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16' + b'\x17\x18\x19\x20\x21\x22\x23\x24', + expect_val='010203040506070809101112131415161718192021222324'), + Paramtest(param_cls=sdkey_cls, + val='0102030405060708091011121314151617181920212223242526272829303132', + expect_clean_val=b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16' + b'\x17\x18\x19\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x30\x31\x32', + expect_val='0102030405060708091011121314151617181920212223242526272829303132'), + + Paramtest(param_cls=sdkey_cls, + val=b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16', + expect_clean_val=b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16', + expect_val='01020304050607080910111213141516', + ), + Paramtest(param_cls=sdkey_cls, + val=bytearray(b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16'), + expect_clean_val=b'\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16', + expect_val='01020304050607080910111213141516', + ), + ]) + + for upp_fname in upp_fnames: + test_nr = -1 + try: + + der = resources.read_binary(smdpp_data.upp, upp_fname) + + for t in param_tests: + test_nr += 1 + + logloc = f'{upp_fname}[{test_nr}] {t.param_cls.__name__}({t.val=!r}:{type(t.val).__name__})' + + param = None + try: + param = t.param_cls() + param.input_value = t.val + param.validate() + except ValueError: + print(f"Error at: {logloc}") + raise + + clean_val = param.value + logloc = f'{logloc} {clean_val=!r}:{type(clean_val).__name__}' + if t.expect_clean_val is not None and t.expect_clean_val != clean_val: + raise ValueError(f'{logloc}: expected' + f' {t.expect_clean_val=!r}:{type(t.expect_clean_val).__name__}') + + # on my laptop, deepcopy is about 30% slower than decoding the DER from scratch: + # pes = copy.deepcopy(orig_pes) + pes = ProfileElementSequence.from_der(der) + try: + param.apply(pes) + except ValueError: + print(f"Error at: {logloc}: {t.param_cls.get_name()}.apply_val({clean_val=!r})") + raise + + changed_der = pes.to_der() + + pes2 = ProfileElementSequence.from_der(changed_der) + + read_back_val = t.param_cls.get_value_from_pes(pes2) + + # compose log string to show the precise type of dict values + if isinstance(read_back_val, dict): + types = set() + for v in read_back_val.values(): + types.add(f'{type(v).__name__}') + + read_back_val_type = '{' + ', '.join(types) + '}' + else: + read_back_val_type = f'{type(read_back_val).__name__}' + + logloc = (f'{logloc} {read_back_val=!r}:{read_back_val_type}') + + if isinstance(read_back_val, dict) and not t.param_cls.get_name() in read_back_val.keys(): + raise ValueError(f'{logloc}: expected to find name {t.param_cls.get_name()!r} in read_back_val') + + expect_val = t.expect_val + if not isinstance(expect_val, dict): + expect_val = { t.param_cls.get_name(): expect_val } + if read_back_val != expect_val: + raise ValueError(f'{logloc}: expected {expect_val=!r}:{type(t.expect_val).__name__}') + + ok = logloc.replace(' clean_val', '\n\tclean_val' + ).replace(' read_back_val', '\n\tread_back_val' + ).replace('=', '=\t' + ) + print(f'\nok: {ok}') + + except: + print(f'Error while testing UPP {upp_fname}') + raise + + +if __name__ == "__main__": + unittest.main() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40823?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia55f0d11f8197ca15a948a83a34b3488acf1a0b4 Gerrit-Change-Number: 40823 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>

1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Implement UE-initiated de-registration procedure

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40819?usp=email ) Change subject: 5gc: Implement UE-initiated de-registration procedure ...................................................................... 5gc: Implement UE-initiated de-registration procedure Change-Id: Iab438d5a7cc5f2ba58943e4568c1fb5e5f41f99d Related: SYS#7073 --- M 5gc/C5G_Tests.ttcn M 5gc/ConnHdlr.ttcn M deps/Makefile M library/NG_NAS_Osmo_Templates.ttcn 4 files changed, 60 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/5gc/C5G_Tests.ttcn b/5gc/C5G_Tests.ttcn index 30615f2..0b71059 100644 --- a/5gc/C5G_Tests.ttcn +++ b/5gc/C5G_Tests.ttcn @@ -291,6 +291,7 @@ private function f_TC_register() runs on ConnHdlr { f_register(); + f_deregister(); } testcase TC_ng_register() runs on MTC_CT { f_init(); @@ -305,6 +306,7 @@ private function f_TC_periodic_registration_updating() runs on ConnHdlr { f_register(); f_periodic_register_update(); + f_deregister(); } testcase TC_periodic_registration_updating() runs on MTC_CT { f_init(); @@ -322,6 +324,7 @@ f_sleep(1.0); f_ping4(g_pars.ue_pars.run_prog_pars.ping_hostname); f_pdu_sess_release(); + f_deregister(); } testcase TC_ng_register_ping4() runs on MTC_CT { f_init(); diff --git a/5gc/ConnHdlr.ttcn b/5gc/ConnHdlr.ttcn index fe96b45..01dcb1a 100644 --- a/5gc/ConnHdlr.ttcn +++ b/5gc/ConnHdlr.ttcn @@ -423,6 +423,34 @@ as_ngap_handle_configuration_update(); } +/* 3GPP TS 24.501 5.5.2.2 UE-initiated de-registration procedure, + * 3GPP TS 23.502 4.2.2.3.2 UE-initiated Deregistration */ +function f_deregister() runs on ConnHdlr { + var template (value) NG_NAS_UL_Message_Type nas_ul_msg; + var NG_NAS_DL_Message_Type rx_nas; + + nas_ul_msg := cs_NG_DEREGISTRATION_REQUEST_MO(crs_DeregisterType ('0'B,/* p_SwitchOff */ + '0'B,/* p_ReReg */ + '01'B/* p_Access */), + g_pars.kset_id, + cs_NG_MobileIdentity_Guti(omit, g_pars.ue_pars.guti)); + NGAP.send(nas_ul_msg); + + NGAP.receive(cr_NG_DEREGISTRATION_ACCEPT_MO); + as_ngap_handle_UeContextReleaseCmd(); +} + +/* 3GPP TS 38.413 8.3.3 UE Context Release (AMF initiated) */ +private altstep as_ngap_handle_UeContextReleaseCmd() runs on ConnHdlr { + var NGAP_PDU rx_ngap; + + [] NGAP.receive(mw_ngap_initMsg(mw_n2_UEContextReleaseCommand)) -> value rx_ngap { + var AMF_UE_NGAP_ID amf_id := valueof(f_NGAP_get_AMF_UE_NGAP_ID(rx_ngap)); + var RAN_UE_NGAP_ID ran_id := valueof(f_NGAP_get_RAN_UE_NGAP_ID(rx_ngap)); + NGAP.send(m_ngap_succMsg(f_ts_n2_UEContextReleaseComplete(amf_id, ran_id, f_ULI()))); + } +} + /* Handle a PDUSessionResourceSetupRequestTransfer contained inside NGAP InitialContextSetupRequest and return a Result for InitialContextSetupResponse */ private function f_pdu_handle_session_resource_released_item(PDUSessionResourceToReleaseItemRelCmd cmd) runs on ConnHdlr return PDUSessionResourceReleasedItemRelRes { diff --git a/deps/Makefile b/deps/Makefile index 818d610..4dba0a1 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -72,7 +72,7 @@ # Use tag names from 'git describe --tags' or commit hashes. This way we get # exact commits of deps when doing regression testing. -nas_commit= dcb175be8b2d9b4daf3e8a4ebf27da3caae8f7cb +nas_commit= ab43cccb96db6067ffba1c763b47cb25cd61b780 titan.Libraries.TCCUsefulFunctions_commit= R.35.B-6-gb3687da titan.ProtocolEmulations.M3UA_commit= b58f92046e48a7b1ed531e243a2319ebca53bf4c titan.ProtocolEmulations.SCCP_commit= 750a3e836831e58eae59d4757ef5d0c759f9ca5d diff --git a/library/NG_NAS_Osmo_Templates.ttcn b/library/NG_NAS_Osmo_Templates.ttcn index c1c8b44..4f8e8cc 100644 --- a/library/NG_NAS_Osmo_Templates.ttcn +++ b/library/NG_NAS_Osmo_Templates.ttcn @@ -405,6 +405,34 @@ } } +/* 24.501 cl. 8.2.12 (UE originating deregister) */ +template (value) NG_NAS_UL_Message_Type +cs_NG_DEREGISTRATION_REQUEST_MO(template (value) DeregisterType p_DeregisterType, + template (value) NAS_KeySetIdentifier p_KSI, + template (value) NG_MobileIdentity p_MobileId) := +{ + deregistration_RequestMO := { + protocolDiscriminator := tsc_EPD_GMM, /* cl. 9.2 M V 1 */ + spareHalfOctet := tsc_SpareHalfOctet, /* cl. 9.3 M V 1/2 */ + securityHeaderType := tsc_SHT_NoSecurityProtection, + messageType := tsc_MT_NG_DeregistrationRequest_MO, /* cl. 9.7 M V 1 */ + ngKSI := p_KSI, /* cl. 9.11.3.32 M V 1/2 */ + deregistrationType := p_DeregisterType, /* cl. 9.11.3.20 M V 1/2 */ + ngMobileId := p_MobileId /* cl. 9.11.3.4 M LV 5-? */ + } +} + +/* 24.501 cl. 8.2.13 De-registration accept (UE originating de-registration) */ +template (present) NG_NAS_DL_Message_Type cr_NG_DEREGISTRATION_ACCEPT_MO := +{ + deregistration_Accept := { + protocolDiscriminator := tsc_EPD_GMM, /* cl. 9.2 M V 1 */ + spareHalfOctet := tsc_SpareHalfOctet, /* cl. 9.3 M V 1/2 */ + securityHeaderType := tsc_SHT_NoSecurityProtection, + messageType := tsc_MT_NG_DeregistrationAccept_MO /* cl. 9.7 M V 1 */ + } +}; + /* 24.501 cl. 8.2.19 */ template (present) NG_NAS_DL_Message_Type cr_NG_CONFIGURATION_UPDATE_COMMAND(template ConfigUpdateInd p_ConfigUpdateInd := *, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40819?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iab438d5a7cc5f2ba58943e4568c1fb5e5f41f99d Gerrit-Change-Number: 40819 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Implement UE-initiated de-registration procedure

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40819?usp=email ) Change subject: 5gc: Implement UE-initiated de-registration procedure ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40819?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iab438d5a7cc5f2ba58943e4568c1fb5e5f41f99d Gerrit-Change-Number: 40819 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 04 Aug 2025 12:47:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month

1
0
0 0

[M] Change in osmo-sgsn[master]: VTY: make max-sdu-size for GPRS SM QoS configurable

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/40822?usp=email ) Change subject: VTY: make max-sdu-size for GPRS SM QoS configurable ...................................................................... VTY: make max-sdu-size for GPRS SM QoS configurable Change-Id: I0819da18dafecf322f8902643dae8dbcaa5dc98b --- M src/sgsn/gprs_sm.c M src/sgsn/sgsn_vty.c 2 files changed, 72 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/22/40822/1 diff --git a/src/sgsn/gprs_sm.c b/src/sgsn/gprs_sm.c index bcf2923..c292505 100644 --- a/src/sgsn/gprs_sm.c +++ b/src/sgsn/gprs_sm.c @@ -63,7 +63,7 @@ }, }; -static struct gsm48_qos default_qos = { +struct gsm48_qos gprs_sm_default_qos = { .delay_class = 4, /* best effort */ .reliab_class = GSM48_QOS_RC_LLC_UN_RLC_ACK_DATA_PROT, .peak_tput = GSM48_QOS_PEAK_TPUT_32000bps, @@ -206,7 +206,7 @@ /* FIXME: copy QoS parameters from original request */ //msgb_lv_put(msg, pdp->lib->qos_neg.l, pdp->lib->qos_neg.v); - msgb_lv_put(msg, sizeof(default_qos), (uint8_t *)&default_qos); + msgb_lv_put(msg, sizeof(gprs_sm_default_qos), (uint8_t *)&gprs_sm_default_qos); /* Radio priority 10.5.7.2 */ msgb_v_put(msg, pdp->lib->radio_pri); diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index 7279167..37d966f 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -66,6 +66,8 @@ #include <osmocom/ranap/iu_client.h> #endif +extern struct gsm48_qos gprs_sm_default_qos; + static struct sgsn_config *g_cfg = NULL; const struct value_string sgsn_auth_pol_strs[] = { @@ -382,6 +384,28 @@ } else vty_out(vty, " no compression v42bis%s", VTY_NEWLINE); +#define QOS_SM_DEFAULT_CMD "qos-sm default" +#define QOS_SM_DEFAULT_CMD_DOC \ + "QoS (Quality of Service) configuration for the GPRS SM layer\n" \ + "Default QoS parameters\n" + + /* QoS defaults */ + switch (gprs_sm_default_qos.max_sdu_size) { + case GSM48_QOS_MAXSDU_1502: + vty_out(vty, " " QOS_SM_DEFAULT_CMD " max-sdu-size 1502%s", VTY_NEWLINE); + break; + case GSM48_QOS_MAXSDU_1510: + vty_out(vty, " " QOS_SM_DEFAULT_CMD " max-sdu-size 1510%s", VTY_NEWLINE); + break; + case GSM48_QOS_MAXSDU_1520: + vty_out(vty, " " QOS_SM_DEFAULT_CMD " max-sdu-size 1520%s", VTY_NEWLINE); + break; + default: + vty_out(vty, " " QOS_SM_DEFAULT_CMD " max-sdu-size %u%s", + gprs_sm_default_qos.max_sdu_size * 10, VTY_NEWLINE); + break; + } + llist_for_each_entry(mme, &sgsn->mme_list, list) { config_write_mme(vty, mme, " "); } @@ -1621,6 +1645,49 @@ return CMD_SUCCESS; } +DEFUN(cfg_qos_sm_default_max_sdu_size, + cfg_qos_sm_default_max_sdu_size_cmd, + QOS_SM_DEFAULT_CMD " max-sdu-size (<10-1500>)", + QOS_SM_DEFAULT_CMD_DOC + "Maximum SDU (Service Data Unit) size\n" + "SDU size (must be a multiple of 10)\n") +{ + int size = atoi(argv[0]); + + switch (size) { + case 1502: + gprs_sm_default_qos.max_sdu_size = GSM48_QOS_MAXSDU_1502; + break; + case 1510: + gprs_sm_default_qos.max_sdu_size = GSM48_QOS_MAXSDU_1510; + break; + case 1520: + gprs_sm_default_qos.max_sdu_size = GSM48_QOS_MAXSDU_1520; + break; + default: + if (size < 1 || size > 1500) + return CMD_WARNING; + if (size % 10 != 0) { + vty_out(vty, "%% SDU size in range 1..1500 " + "must be a multiple of 10%s", VTY_NEWLINE); + return CMD_WARNING; + } + gprs_sm_default_qos.max_sdu_size = size / 10; + break; + } + + return CMD_SUCCESS; +} + +ALIAS(cfg_qos_sm_default_max_sdu_size, + cfg_qos_sm_default_max_sdu_size_15xx_cmd, + QOS_SM_DEFAULT_CMD " max-sdu-size (1502|1510|1520)", + QOS_SM_DEFAULT_CMD_DOC + "Maximum SDU (Service Data Unit) size\n" + "1502 octets\n" + "1510 octets\n" + "1520 octets\n"); + #if BUILD_IU DEFUN(cfg_sgsn_cs7_instance_iu, cfg_sgsn_cs7_instance_iu_cmd, @@ -1895,6 +1962,9 @@ install_element(SGSN_NODE, &cfg_comp_v42bis_cmd); install_element(SGSN_NODE, &cfg_comp_v42bisp_cmd); + install_element(SGSN_NODE, &cfg_qos_sm_default_max_sdu_size_cmd); + install_element(SGSN_NODE, &cfg_qos_sm_default_max_sdu_size_15xx_cmd); + install_element(SGSN_NODE, &cfg_sgsn_mme_cmd); install_element(SGSN_NODE, &cfg_sgsn_no_mme_cmd); install_node(&mme_node, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/40822?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0819da18dafecf322f8902643dae8dbcaa5dc98b Gerrit-Change-Number: 40822 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 month, 1 week

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/master-builds: fix repos_url for enftables

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40820?usp=email ) Change subject: jobs/master-builds: fix repos_url for enftables ...................................................................... jobs/master-builds: fix repos_url for enftables enftables is not in Gerrit, use the Gitea URL instead. Change-Id: I3a50a4498c22c56129a40e410ab30c0e6bfee1ec Fixes: 46ad4f8 ("jobs/master-builds: add logger_gsmtap and enftables") --- M jobs/master-builds.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index af8432a..b522774 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -322,7 +322,7 @@ cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' - enftables: - repos_url: '{gerrit_url}/erlang/{repos}' + repos_url: '{gitea_url}/erlang/{repos}' cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' - osmo-e1-hardware: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40820?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3a50a4498c22c56129a40e410ab30c0e6bfee1ec Gerrit-Change-Number: 40820 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 1 week

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/master-builds: fix repos_url for enftables

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ci/+/40820?usp=email ) Change subject: jobs/master-builds: fix repos_url for enftables ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40820?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3a50a4498c22c56129a40e410ab30c0e6bfee1ec Gerrit-Change-Number: 40820 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Aug 2025 20:27:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2025