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

Change in pysim[master]: pySim-shell: Remove unused imports

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28625 ) Change subject: pySim-shell: Remove unused imports ...................................................................... pySim-shell: Remove unused imports Those might have been used some time ago, but they are not. Change-Id: I00f096fc8049c0aebc1127f9a1725638d973af0e --- M pySim-shell.py 1 file changed, 3 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim-shell.py b/pySim-shell.py index 33332a2..dd8b8d0 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -32,23 +32,17 @@ from pathlib import Path from io import StringIO -from pySim.ts_51_011 import EF, DF, EF_SST_map -from pySim.ts_31_102 import EF_UST_map, EF_USIM_ADF_map -from pySim.ts_31_103 import EF_IST_map, EF_ISIM_ADF_map - from pySim.exceptions import * from pySim.commands import SimCardCommands from pySim.transport import init_reader, ApduTracer, argparse_add_reader_args from pySim.cards import card_detect, SimCard -from pySim.utils import h2b, swap_nibbles, rpad, b2h, h2s, JsonEncoder, bertlv_parse_one, sw_match -from pySim.utils import dec_st, sanitize_pin_adm, tabulate_str_list, is_hex, boxed_heading_str +from pySim.utils import h2b, swap_nibbles, rpad, b2h, JsonEncoder, bertlv_parse_one, sw_match +from pySim.utils import sanitize_pin_adm, tabulate_str_list, boxed_heading_str from pySim.card_handler import CardHandler, CardHandlerAuto -from pySim.filesystem import CardMF, RuntimeState, CardDF, CardADF, CardModel +from pySim.filesystem import RuntimeState, CardDF, CardADF, CardModel from pySim.profile import CardProfile -from pySim.ts_51_011 import CardProfileSIM, DF_TELECOM, DF_GSM from pySim.ts_102_221 import CardProfileUICC -from pySim.ts_102_221 import CardProfileUICCSIM from pySim.ts_102_222 import Ts102222Commands from pySim.ts_31_102 import CardApplicationUSIM from pySim.ts_31_103 import CardApplicationISIM -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I00f096fc8049c0aebc1127f9a1725638d973af0e Gerrit-Change-Number: 28625 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

2 years, 11 months

1
0
0 0

Change in pysim[master]: fileystem: Use human-readable ADF name if available.

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28627 ) Change subject: fileystem: Use human-readable ADF name if available. ...................................................................... fileystem: Use human-readable ADF name if available. When using __str__ for a CardDF we would get "DF(DF.TELECOM)" but when using it on CardADF we would get ADF(a0000000871002)" instead of "ADF(ADF.USIM)". Let's fix that. Change-Id: I5801a08bcc28cb222734af6d9ee835227f4fee69 --- M pySim/filesystem.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 813bebb..a3e83d6 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -488,7 +488,7 @@ mf.add_application_df(self) def __str__(self): - return "ADF(%s)" % (self.aid) + return "ADF(%s)" % (self.name if self.name else self.aid) def _path_element(self, prefer_name: bool): if self.name and prefer_name: 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5801a08bcc28cb222734af6d9ee835227f4fee69 Gerrit-Change-Number: 28627 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in pysim[master]: ts_31_102: Fix FID in DF.HNB

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28629 ) Change subject: ts_31_102: Fix FID in DF.HNB ...................................................................... ts_31_102: Fix FID in DF.HNB The FID are all specified as 4f8x and not 4f0x Change-Id: I0cfd623693a5017efe01bc6891640db22ba3f9f9 --- M pySim/ts_31_102.py 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index fa3af75..cf03a50 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -1102,12 +1102,12 @@ def __init__(self, fid='5f50', name='DF.HNB', desc='Files for HomeNodeB purpose', **kwargs): super().__init__(fid=fid, name=name, desc=desc, **kwargs) files = [ - LinFixedEF('4f01', 0x01, 'EF.ACSGL', 'Allowed CSG Lists', service=86), - LinFixedEF('4f02', 0x02, 'EF.CSGTL', 'CSG Types', service=86), - LinFixedEF('4f03', 0x03, 'EF.HNBN', 'Home NodeB Name', service=86), - LinFixedEF('4f04', 0x04, 'EF.OCSGL', 'Operator CSG Lists', service=90), - LinFixedEF('4f05', 0x05, 'EF.OCSGT', 'Operator CSG Type', service=90), - LinFixedEF('4f06', 0x06, 'EF.OHNBN', 'Operator Home NodeB Name', service=90), + LinFixedEF('4f81', 0x01, 'EF.ACSGL', 'Allowed CSG Lists', service=86), + LinFixedEF('4f82', 0x02, 'EF.CSGTL', 'CSG Types', service=86), + LinFixedEF('4f83', 0x03, 'EF.HNBN', 'Home NodeB Name', service=86), + LinFixedEF('4f84', 0x04, 'EF.OCSGL', 'Operator CSG Lists', service=90), + LinFixedEF('4f85', 0x05, 'EF.OCSGT', 'Operator CSG Type', service=90), + LinFixedEF('4f86', 0x06, 'EF.OHNBN', 'Operator Home NodeB Name', service=90), ] self.add_files(files) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0cfd623693a5017efe01bc6891640db22ba3f9f9 Gerrit-Change-Number: 28629 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in pysim[master]: filesystem: raise exception only when applicable

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28623 ) Change subject: filesystem: raise exception only when applicable ...................................................................... filesystem: raise exception only when applicable We should first see if any of the files in the tree actually require a service mapping before raising ValueError('TODO: implement recursive service -> file mapping') Change-Id: I9c339f0cac020e7eec7f4f840748040e5f77923d --- M pySim/filesystem.py 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 37c668d..c40eaf8 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -301,6 +301,14 @@ else: raise ValueError + def _has_service(self): + if self.service: + return True + for c in self.children.values(): + if isinstance(c, CardDF): + if c._has_service(): + return True + def add_file(self, child: CardFile, ignore_existing: bool = False): """Add a child (DF/EF) to this DF. Args: @@ -336,7 +344,10 @@ for c in child.children.values(): self._add_file_services(c) if isinstance(c, CardDF): - raise ValueError('TODO: implement recursive service -> file mapping') + for gc in c.children.values(): + if isinstance(gc, CardDF): + if gc._has_service(): + raise ValueError('TODO: implement recursive service -> file mapping') def add_files(self, children: Iterable[CardFile], ignore_existing: bool = False): """Add a list of child (DF/EF) to this DF -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9c339f0cac020e7eec7f4f840748040e5f77923d Gerrit-Change-Number: 28623 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in pysim[master]: filesystem: keep track of currently selected ADF

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28624 ) Change subject: filesystem: keep track of currently selected ADF ...................................................................... filesystem: keep track of currently selected ADF As it is possible to select files relative to the currently selected ADF, we should keep track of that. Change-Id: I83c93fdcd23b1d3877644ef0bf72d330343fbbc7 --- M pySim/filesystem.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pySim/filesystem.py b/pySim/filesystem.py index c40eaf8..813bebb 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -1253,6 +1253,7 @@ self.mf = CardMF(profile=profile) self.card = card self.selected_file = self.mf # type: CardDF + self.selected_adf = None self.profile = profile self.selected_file_fcp = None self.selected_file_fcp_hex = None @@ -1337,6 +1338,7 @@ atr = i2h(self.card.reset()) # select MF to reset internal state and to verify card really works self.select('MF', cmd_app) + self.selected_adf = None return atr def get_cwd(self) -> CardDF: @@ -1445,6 +1447,7 @@ try: if isinstance(p, CardADF): (data, sw) = self.card.select_adf_by_aid(p.aid) + self.selected_adf = p else: (data, sw) = self.card._scc.select_file(p.fid) self.selected_file = p -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I83c93fdcd23b1d3877644ef0bf72d330343fbbc7 Gerrit-Change-Number: 28624 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in pysim[master]: ts_31_102: Fix FID in DF.HNB

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28629 ) Change subject: ts_31_102: Fix FID in DF.HNB ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0cfd623693a5017efe01bc6891640db22ba3f9f9 Gerrit-Change-Number: 28629 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Jul 2022 21:13:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in pysim[master]: filesystem: keep track of currently selected ADF

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28624 ) Change subject: filesystem: keep track of currently selected ADF ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I83c93fdcd23b1d3877644ef0bf72d330343fbbc7 Gerrit-Change-Number: 28624 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Jul 2022 21:12:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in pysim[master]: filesystem: raise exception only when applicable

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28623 ) Change subject: filesystem: raise exception only when applicable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9c339f0cac020e7eec7f4f840748040e5f77923d Gerrit-Change-Number: 28623 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Jul 2022 21:12:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Add initial SBc-AP support to osmo-cbc

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28602 ) Change subject: Add initial SBc-AP support to osmo-cbc ...................................................................... Patch Set 11: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ib278bc1d1a74459814016fef7a8fe21cc29d46c9 Gerrit-Change-Number: 28602 Gerrit-PatchSet: 11 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> 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: Mon, 18 Jul 2022 20:58:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: doc: Document SBc-AP support and config

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28640 ) Change subject: doc: Document SBc-AP support and config ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ic14ec2766fce251a6fe52a77d7bc0bbcd8d3afbf Gerrit-Change-Number: 28640 Gerrit-PatchSet: 5 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, 18 Jul 2022 20:57:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022