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

[S] Change in pysim[master]: ts_31_103: Add construct for EF.GBABP and EF.GBANL
by laforge 04 Jan '24

04 Jan '24

Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/35424?usp=email to look at the new patch set (#7). Change subject: ts_31_103: Add construct for EF.GBABP and EF.GBANL ...................................................................... ts_31_103: Add construct for EF.GBABP and EF.GBANL Change-Id: Ife06f54c2443f3e048bd36f706f309843703403a --- M pySim/ts_31_103.py M pysim-testdata/pySim-trace_test_gsmtap.pcapng.ok 2 files changed, 22 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/24/35424/7 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35424?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: Ife06f54c2443f3e048bd36f706f309843703403a Gerrit-Change-Number: 35424 Gerrit-PatchSet: 7 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in pysim[master]: ts_31_103: Add construct for EF.GBABP and EF.GBANL
by laforge 04 Jan '24

04 Jan '24

Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/35424?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Code-Review+2 by fixeria, Verified-1 by Jenkins Builder Change subject: ts_31_103: Add construct for EF.GBABP and EF.GBANL ...................................................................... ts_31_103: Add construct for EF.GBABP and EF.GBANL Change-Id: Ife06f54c2443f3e048bd36f706f309843703403a --- M pySim/ts_31_103.py 1 file changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/24/35424/6 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35424?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: Ife06f54c2443f3e048bd36f706f309843703403a Gerrit-Change-Number: 35424 Gerrit-PatchSet: 6 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in pysim[master]: construct: avoid StreamError exceptions due to files containing all-ff
by laforge 04 Jan '24

04 Jan '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35487?usp=email ) Change subject: construct: avoid StreamError exceptions due to files containing all-ff ...................................................................... construct: avoid StreamError exceptions due to files containing all-ff In smart cards, files/records containing all-ff means they are simply not used/initialized. Let's avoid raising exceptions when interpreting 0xff as length value and reading less bytes as value. Change-Id: I09c3cb82063fc094eb047749996a6eceff757ea2 --- M pySim/construct.py 1 file changed, 23 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/87/35487/1 diff --git a/pySim/construct.py b/pySim/construct.py index 1ed3576..0c82c41 100644 --- a/pySim/construct.py +++ b/pySim/construct.py @@ -402,7 +402,16 @@ """Helper function to wrap around normalize_construct() and filter_dict().""" if not length: length = len(raw_bin_data) - parsed = c.parse(raw_bin_data, total_len=length, **context) + try: + parsed = c.parse(raw_bin_data, total_len=length, **context) + except StreamError as e: + # if the input is all-ff, this means the content is undefined. Let's avoid passing StreamError + # exceptions in those situations (which might occur if a length field 0xff is 255 but then there's + # actually less bytes in the remainder of the file. + if all([v == 0xff for v in raw_bin_data]): + return None + else: + raise e return normalize_construct(parsed) def build_construct(c, decoded_data, context: dict = {}): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35487?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: I09c3cb82063fc094eb047749996a6eceff757ea2 Gerrit-Change-Number: 35487 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[M] Change in pysim[master]: ts_31_102: Start to use construct for EF.SUCI_Calc_Info
by laforge 04 Jan '24

04 Jan '24

Attention is currently required from: dexter, fixeria, merlinchlosta. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35427?usp=email ) Change subject: ts_31_102: Start to use construct for EF.SUCI_Calc_Info ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35427?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: I4ad5ea57bab37c2dc218e7752d538aa4cdc36ee3 Gerrit-Change-Number: 35427 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: merlinchlosta <merlin.chlosta(a)rub.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: merlinchlosta <merlin.chlosta(a)rub.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 04 Jan 2024 19:39:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in pysim[master]: ts_102_310: Add file definitions resembling ETSI TS 102 310 (EAP)
by laforge 04 Jan '24

04 Jan '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35486?usp=email ) Change subject: ts_102_310: Add file definitions resembling ETSI TS 102 310 (EAP) ...................................................................... ts_102_310: Add file definitions resembling ETSI TS 102 310 (EAP) The definitions are not used yet, as one would have to add that dynamically based on which EF.DIR entries contain the 0x73 discretionary template. As I don't have any cards implementing this so far, I'll skip that part. Change-Id: I532ff2c94021ab1b4520fe2b6988c8960319d208 --- A pySim/ts_102_310.py 1 file changed, 128 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/86/35486/1 diff --git a/pySim/ts_102_310.py b/pySim/ts_102_310.py new file mode 100644 index 0000000..75b9206 --- /dev/null +++ b/pySim/ts_102_310.py @@ -0,0 +1,114 @@ +# coding=utf-8 +"""Utilities / Functions related to ETSI TS 102 310, the EAP UICC spec. + +(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 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/>. +""" + +from pySim.construct import * +from construct import * +from construct import Optional as COptional + +#from pySim.utils import * +from pySim.filesystem import CardDF, TransparentEF +from pySim.tlv import BER_TLV_IE, TLV_IE_Collection + +# TS102 310 Section 7.1 +class EF_EAPKEYS(TransparentEF): + class Msk(BER_TLV_IE, tag=0x80): + _construct = HexAdapter(GreedyBytes) + class Emsk(BER_TLV_IE, tag=0x81): + _construct = HexAdapter(GreedyBytes) + class MskCollection(TLV_IE_Collection, nested=[Msk, Emsk]): + pass + + def __init__(self, fid='4f01', name='EF.EAPKEYS', desc='EAP derived keys'): + super().__init__(fid, sfid=0x01, name=name, desc=desc, size=(1,None)) + self._tlv = EF_EAPKEYS.MskCollection + +# TS 102 310 Section 7.2 +class EF_EAPSTATUS(TransparentEF): + def __init__(self, fid='4f02', name='EF.EAPSTATUS', desc='EAP Authentication Status'): + super().__init__(fid, sfid=0x02, name=name, desc=desc, size=(1,1)) + self._construct = Enum(Int8ub, no_auth_started=0, authenticating=1, + authenticated=2, held_auth_failure=3) + +# TS 102 310 Section 7.3 +class EF_PUId(TransparentEF): + def __init__(self, fid='4f03', name='EF.PUId', desc='Permanent User Identity'): + super().__init__(fid, sfid=0x03, name=name, desc=desc, size=(10,None)) + self._construct = GreedyBytes + +# TS 102 310 Section 7.4 +class EF_Ps(TransparentEF): + def __init__(self, fid='4f04', name='EF.Ps', desc='Pseudonym'): + super().__init__(fid, sfid=0x04, name=name, desc=desc, size=(1,None)) + self._construct = GreedyBytes + +# TS 102 310 Section 7.5 +class EF_CurID(TransparentEF): + def __init__(self, fid='4f20', name='EF.CurID', desc='Current Identity'): + super().__init__(fid, sfid=0x10, name=name, desc=desc, size=(1,None)) + self._construct = Struct('type'/Enum(Int8ub, permanent=0, pseudonym=1, re_authentication=2, should_not_be_revealed=255), + '_len'/Int8ub, + 'value'/Utf8Adapter(this._len)) + + +# TS 102 310 Section 7.6 +class EF_ReID(TransparentEF): + def Identity(BER_TLV_IE, tag=0x80): + _construct = Utf8Adapter(GreedyBytes) + def Counter(BER_TLV_IE, tag=0x81): + _construct = GreedyInteger + def Colleciton(TLV_IE_Collection, nested=[Identity,Counter]): + pass + + def __init__(self, fid='4f21', name='EF.ReID', desc='Re-Authentication Identity'): + super().__init__(fid, sfid=0x11, name=name, desc=desc, size=(1,None)) + self._tlv = EF_ReID.Collection + +# TS 102 310 Section 7.7 +class EF_ReID(TransparentEF): + def __init__(self, fid='4f22', name='EF.Realm', desc='Relm value of the identity'): + super().__init__(fid, sfid=0x12, name=name, desc=desc, size=(1,None)) + self._construct = Struct('_len'/Int8ub, + 'realm'/Utf8Adapter(Bytes(this._len))) + +class DF_EAP(CardDF): + # DF.EAP has no default FID; it always must be discovered via the EF.DIR entry + # and the 0x73 "discretionary template" + def __init__(self, fid, name='DF.EAP', desc='EAP client'): + super().__init__(fid=fid, name=name, desc=desc, **kwargs) + files = [ + EF_EAPKEYS(), + EF_EAPSTATUS(), + EF_PuID(), + EF_CurID(), + EF_ReID(), + ] + self.add_files(files) + + +# TS 102 310 Section 5.2 +class EapSupportedTypesList(BER_TLV_IE, tag=0x80): + _construct = GreedyRange(Int8ub) +class EapDedictedFilesList(BER_TLV_IE, tag=0x81): + _construct = GreedyRange(Int16ub) +class EapLabel(BER_TLV_IE, tag=0x82): + _construct = GreedyBytes +class EapAppSvcSpecData(BER_TLV_IE, 0xa0, nested=[EapSupportedTypesList, EapDedicatedFileList, EapLabel]): + pass +class DiscretionaryTemplate(BER_TLV_IE, 0x73, nested=[EapAppSvcSpecData]): + pass -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35486?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: I532ff2c94021ab1b4520fe2b6988c8960319d208 Gerrit-Change-Number: 35486 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[M] Change in pysim[master]: ts_31_102: Start to use construct for EF.SUCI_Calc_Info
by laforge 04 Jan '24

04 Jan '24

Attention is currently required from: dexter, fixeria, laforge, merlinchlosta. Hello Jenkins Builder, dexter, fixeria, merlinchlosta, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/35427?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Verified-1 by Jenkins Builder Change subject: ts_31_102: Start to use construct for EF.SUCI_Calc_Info ...................................................................... ts_31_102: Start to use construct for EF.SUCI_Calc_Info We cannot fully switch to construct for all of it easily due to the priority value and the ordering/sorting by priority implemented in the hand-coded version. But we can at least migrate the encode/decode of the hnet_pubkey_list via construct. Change-Id: I4ad5ea57bab37c2dc218e7752d538aa4cdc36ee3 --- M pySim/ts_31_102.py M tests/test_utils.py 2 files changed, 44 insertions(+), 62 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/27/35427/6 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35427?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: I4ad5ea57bab37c2dc218e7752d538aa4cdc36ee3 Gerrit-Change-Number: 35427 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: merlinchlosta <merlin.chlosta(a)rub.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: merlinchlosta <merlin.chlosta(a)rub.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-bts[master]: ctrl: Add max ber10k rach
by pespin 04 Jan '24

04 Jan '24

Attention is currently required from: matanp. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35485?usp=email ) Change subject: ctrl: Add max ber10k rach ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35485?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: I466ee7ab0f8b24f14a91875ae2c720da3e506bd1 Gerrit-Change-Number: 35485 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: matanp <matan1008(a)gmail.com> Gerrit-Comment-Date: Thu, 04 Jan 2024 18:06:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: ctrl: Add max ber10k rach
by matanp 04 Jan '24

04 Jan '24

matanp has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/35485?usp=email ) Change subject: ctrl: Add max ber10k rach ...................................................................... ctrl: Add max ber10k rach Change-Id: I466ee7ab0f8b24f14a91875ae2c720da3e506bd1 --- M src/common/bts_ctrl_commands.c 1 file changed, 42 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/85/35485/1 diff --git a/src/common/bts_ctrl_commands.c b/src/common/bts_ctrl_commands.c index faaba6a..a4697b6 100644 --- a/src/common/bts_ctrl_commands.c +++ b/src/common/bts_ctrl_commands.c @@ -84,12 +84,45 @@ return CTRL_CMD_REPLY; } +static int verify_max_ber10k_rach(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + int max_ber10k_rach = atoi(cmd->value); + + if (max_ber10k_rach < 0 || max_ber10k_rach > 10000) { + cmd->reply = "Value is out of range"; + return 1; + } + + return 0; +} + +static int get_max_ber10k_rach(struct ctrl_cmd *cmd, void *data) +{ + cmd->reply = talloc_asprintf(cmd, "%u", g_bts->max_ber10k_rach); + if (!cmd->reply) { + cmd->reply = "OOM"; + return CTRL_CMD_ERROR; + } + + return CTRL_CMD_REPLY; +} + +static int set_max_ber10k_rach(struct ctrl_cmd *cmd, void *data) +{ + g_bts->max_ber10k_rach = atoi(cmd->value); + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE(max_ber10k_rach, "max-ber10k-rach"); + int bts_ctrl_cmds_install(struct gsm_bts *bts) { int rc = 0; rc |= ctrl_cmd_install(CTRL_NODE_TRX, &cmd_therm_att); rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_oml_alert); + rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_max_ber10k_rach); g_bts = bts; return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35485?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: I466ee7ab0f8b24f14a91875ae2c720da3e506bd1 Gerrit-Change-Number: 35485 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bsc[master]: vty: Ensure radio-link-timeout is a multiple of 4
by matanp 04 Jan '24

04 Jan '24

matanp has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35484?usp=email ) Change subject: vty: Ensure radio-link-timeout is a multiple of 4 ...................................................................... vty: Ensure radio-link-timeout is a multiple of 4 According to Table 10.5.2.3.1 in TS 144.018, radio-link-timeout values are between 4 to 64 in steps of 4. Change-Id: I733591d5f72f2e4f822761ca9eda85de7a4c6c81 --- M src/osmo-bsc/bts_vty.c 1 file changed, 20 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified matanp: Looks good to me, approved diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index ef8b8bd..54eb5cf 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -1481,8 +1481,15 @@ "Radio link timeout value (lost SACCH block)\n") { struct gsm_bts *bts = vty->index; + unsigned int radio_link_timeout = atoi(argv[0]); - gsm_bts_set_radio_link_timeout(bts, atoi(argv[0])); + /* According to Table 10.5.2.3.1 in TS 144.018 */ + if (radio_link_timeout % 4 != 0) { + vty_out(vty, "%% Radio link timeout must be a multiple of 4%s", VTY_NEWLINE); + return CMD_WARNING; + } + + gsm_bts_set_radio_link_timeout(bts, radio_link_timeout); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35484?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I733591d5f72f2e4f822761ca9eda85de7a4c6c81 Gerrit-Change-Number: 35484 Gerrit-PatchSet: 2 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-bsc[master]: vty: Ensure radio-link-timeout is a multiple of 4
by matanp 04 Jan '24

04 Jan '24

matanp has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35484?usp=email ) Change subject: vty: Ensure radio-link-timeout is a multiple of 4 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35484?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I733591d5f72f2e4f822761ca9eda85de7a4c6c81 Gerrit-Change-Number: 35484 Gerrit-PatchSet: 2 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 04 Jan 2024 17:06:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0