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

[XL] Change in pysim[master]: split pySim/legacy/{cards,utils} from pySim/{cards,utils}
by laforge 12 Jul '23

12 Jul '23

Attention is currently required from: fixeria, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33691 ) Change subject: split pySim/legacy/{cards,utils} from pySim/{cards,utils} ...................................................................... Patch Set 7: (1 comment) Patchset: PS7: apparently pylint also only works on sub-modules if they have an __init__..py -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia8cf831929730c48f90679a83d69049475cc5077 Gerrit-Change-Number: 33691 Gerrit-PatchSet: 7 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Jul 2023 20:05:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[XL] Change in pysim[master]: split pySim/legacy/{cards,utils} from pySim/{cards,utils}
by laforge 12 Jul '23

12 Jul '23

Attention is currently required from: laforge, fixeria, dexter. Hello Jenkins Builder, fixeria, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/33691 to look at the new patch set (#7). Change subject: split pySim/legacy/{cards,utils} from pySim/{cards,utils} ...................................................................... split pySim/legacy/{cards,utils} from pySim/{cards,utils} There are some functions / classes which are only needed by the legacy tools pySim-{read,prog}, bypassing our modern per-file transcoder classes. Let's move this code to the pySim/legacy sub-directory, rendering pySim.legacy.* module names. The long-term goal is to get rid of those and have all code use the modern pySim/filesystem classes for reading/decoding/encoding/writing any kind of data on cards. Change-Id: Ia8cf831929730c48f90679a83d69049475cc5077 --- M pySim-prog.py M pySim-read.py M pySim-shell.py M pySim-trace.py M pySim/cards.py A pySim/legacy/__init__.py A pySim/legacy/cards.py A pySim/legacy/utils.py M pySim/utils.py M setup.py M tests/test_utils.py 11 files changed, 1,942 insertions(+), 1,926 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/91/33691/7 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia8cf831929730c48f90679a83d69049475cc5077 Gerrit-Change-Number: 33691 Gerrit-PatchSet: 7 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in pysim[master]: ts_102_221: Remove CardProfileUICCSIM
by laforge 12 Jul '23

12 Jul '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/33724 ) Change subject: ts_102_221: Remove CardProfileUICCSIM ...................................................................... ts_102_221: Remove CardProfileUICCSIM This profile has always been a hack/work-around for the situation that a classic GSM SIM is not a UICC, and we didn't yet have the concept of CardProfileAddons yet, so there was no way to probe and add something to an UICC which was not an application with its own AID/ADF. Since now we have CardProfileAddons (including one for GSM SIM), and pySim-trace (the other user of CardProfileUICCSIM) has also switched over to using CardProfileUICC + addons, we can remove this work-around. Change-Id: I45cec68d72f2003123da4c3f86ed6a5a90988bd8 --- M pySim/ts_102_221.py 1 file changed, 18 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/24/33724/1 diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index df8b842..ac0dc84 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -886,21 +886,3 @@ of the card is required between SUSPEND and RESUME, and only very few non-RESUME commands are permitted between SUSPEND and RESUME. See TS 102 221 Section 11.1.22.""" self._cmd.card._scc.resume_uicc(opts.token) - - -class CardProfileUICCSIM(CardProfileUICC): - """Same as above, but including 2G SIM support""" - - ORDER = 0 - - def __init__(self): - super().__init__('UICC-SIM') - - # Add GSM specific files - self.files_in_mf.append(DF_TELECOM()) - self.files_in_mf.append(DF_GSM()) - - @staticmethod - def match_with_card(scc: SimCardCommands) -> bool: - # don't ever select this profile, we only use this from pySim-trace - return False -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I45cec68d72f2003123da4c3f86ed6a5a90988bd8 Gerrit-Change-Number: 33724 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[M] Change in pysim[master]: Introduce concept of CardProfileAddon
by laforge 12 Jul '23

12 Jul '23

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33699 ) Change subject: Introduce concept of CardProfileAddon ...................................................................... Patch Set 4: Code-Review-1 (3 comments) This change is ready for review. File pySim/cdma_ruim.py: https://gerrit.osmocom.org/c/pysim/+/33699/comment/985fc7d2_129e57cf PS4, Line 196: can be found on either classic GSM SIM or on UICC to support GSM-R > I am guessing you meant R-UIM here, not GSM-R? `-ETOOMANYRRRRR` ;) Done File pySim/filesystem.py: https://gerrit.osmocom.org/c/pysim/+/33699/comment/018d1ec9_30787e0f PS3, Line 1310: for addon_cls in self.profile.addons: > this must not happen in the constructor, as pySim-trace also uses RuntimeState. […] this actually is not true. the DummySimLink will return SW 9000 to all APDUs and hence all probes will be succesful. This means the pySim-trace will get all add-ons enabled, which is a good idea since we have no idea what kind of files etc. will appear in the trace. File pySim/profile.py: https://gerrit.osmocom.org/c/pysim/+/33699/comment/19cb5071_dccbd696 PS4, Line 194: probe > Right. […] Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5866590b6d48f85eb889c9b1b8ab27936d2378b9 Gerrit-Change-Number: 33699 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Jul 2023 19:56:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: cdma_ruim: Fix unit tests and actually enable them
by laforge 12 Jul '23

12 Jul '23

Attention is currently required from: fixeria, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33704 ) Change subject: cdma_ruim: Fix unit tests and actually enable them ...................................................................... Patch Set 1: (1 comment) File pySim/cdma_ruim.py: https://gerrit.osmocom.org/c/pysim/+/33704/comment/e58a1ef8_97021cbb PS1, Line 136: HexAdapter > yes, nice catch! Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icdf4621eb68d05a4948ae9efeb81a007d48e1bb7 Gerrit-Change-Number: 33704 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Jul 2023 19:45:15 +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> Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: cdma_ruim: Fix unit tests and actually enable them
by laforge 12 Jul '23

12 Jul '23

Attention is currently required from: fixeria, dexter. Hello Jenkins Builder, fixeria, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/33704 to look at the new patch set (#2). Change subject: cdma_ruim: Fix unit tests and actually enable them ...................................................................... cdma_ruim: Fix unit tests and actually enable them As pySim.cdma_ruim was not imported by test_files.py, the unit tests were apparently never executed and hence didn't pass. Let's fix both of those problems. Change-Id: Icdf4621eb68d05a4948ae9efeb81a007d48e1bb7 --- M pySim/cdma_ruim.py M tests/test_files.py 2 files changed, 17 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/04/33704/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icdf4621eb68d05a4948ae9efeb81a007d48e1bb7 Gerrit-Change-Number: 33704 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[L] Change in pysim[master]: create pySim.legacy.ts_51_011.py and move legacy code there
by laforge 12 Jul '23

12 Jul '23

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33693 ) Change subject: create pySim.legacy.ts_51_011.py and move legacy code there ...................................................................... Patch Set 4: (2 comments) File pySim/legacy/ts_51_011.py: https://gerrit.osmocom.org/c/pysim/+/33693/comment/c7110a12_4a5bf4cd PS3, Line 3: # without this, pylint will fail when inner classes are used : # within the 'nested' kwarg of our TlvMeta metaclass on python 3.7 :( : # pylint > This is not needed here anymore. Done https://gerrit.osmocom.org/c/pysim/+/33693/comment/bd170e1a_9b6c9f8c PS3, Line 7: """ Various constants from 3GPP TS 51.011 used by *legacy* code only. > the point is that nobody should use those incomplete data types here anymore. […] Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I20ceea3fdb02ee70d8c8889c078b2e5a0f17c83b Gerrit-Change-Number: 33693 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Jul 2023 19:43:38 +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> Gerrit-MessageType: comment

1 0

[L] Change in pysim[master]: create pySim.legacy.ts_51_011.py and move legacy code there
by laforge 12 Jul '23

12 Jul '23

Attention is currently required from: fixeria. Hello Jenkins Builder, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/33693 to look at the new patch set (#5). Change subject: create pySim.legacy.ts_51_011.py and move legacy code there ...................................................................... create pySim.legacy.ts_51_011.py and move legacy code there Those old flat dicts indicating FID to string-name mapping have long been obsoleted by the pySim.filsystem based classes. Change-Id: I20ceea3fdb02ee70d8c8889c078b2e5a0f17c83b --- M pySim-prog.py M pySim-read.py M pySim/legacy/cards.py A pySim/legacy/ts_51_011.py M pySim/ts_51_011.py 5 files changed, 275 insertions(+), 233 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/93/33693/5 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I20ceea3fdb02ee70d8c8889c078b2e5a0f17c83b Gerrit-Change-Number: 33693 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in pysim[master]: pySim/cards: Add type annotations
by laforge 12 Jul '23

12 Jul '23

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33692 ) Change subject: pySim/cards: Add type annotations ...................................................................... Patch Set 4: (4 comments) File pySim/cards.py: https://gerrit.osmocom.org/c/pysim/+/33692/comment/80e2a8d3_a48aa915 PS4, Line 39: reset > Missing return type annotation. Something like `-> Optional[... […] Done https://gerrit.osmocom.org/c/pysim/+/33692/comment/33ef514c_ab1c41cd PS4, Line 47: set_apdu_parameter > Functions returning nothing should be annotated as such using `-> None`. thanks, didn't know that and I think never did that anywhere so far. https://gerrit.osmocom.org/c/pysim/+/33692/comment/3af71635_868c1cde PS4, Line 124: Hexstr > `-> Optional[Hexstr]` Done https://gerrit.osmocom.org/c/pysim/+/33692/comment/8c539bb2_7e9e9481 PS4, Line 134: Hexstr > `-> Optional[Hexstr]` Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id5752a64b59097584301c860ebf74d858ed3d240 Gerrit-Change-Number: 33692 Gerrit-PatchSet: 4 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Jul 2023 19:41:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: pySim/cards: Add type annotations
by laforge 12 Jul '23

12 Jul '23

Attention is currently required from: laforge. Hello Jenkins Builder, fixeria, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/33692 to look at the new patch set (#5). Change subject: pySim/cards: Add type annotations ...................................................................... pySim/cards: Add type annotations Change-Id: Id5752a64b59097584301c860ebf74d858ed3d240 --- M pySim/cards.py 1 file changed, 27 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/92/33692/5 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id5752a64b59097584301c860ebf74d858ed3d240 Gerrit-Change-Number: 33692 Gerrit-PatchSet: 5 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0