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

[S] Change in pysim[master]: jenkins.sh: Include es9p_client in pylint

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/37146?usp=email ) Change subject: jenkins.sh: Include es9p_client in pylint ...................................................................... jenkins.sh: Include es9p_client in pylint Change-Id: I06f6773b8b5d3dfa588617d5af81c2fddb474a3d --- M contrib/jenkins.sh 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 6fb3d1a..96c4d2b 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -57,7 +57,8 @@ --disable E0401 \ --enable W0301 \ pySim tests/*.py *.py \ - contrib/es2p_client.py + contrib/es2p_client.py \ + contrib/es9p_client.py ;; "docs") rm -rf docs/_build -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37146?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: I06f6773b8b5d3dfa588617d5af81c2fddb474a3d Gerrit-Change-Number: 37146 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[M] Change in pysim[master]: pySim.cat: Add more alredy-defined IEs to ProactiveCmd classes

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/37138?usp=email ) Change subject: pySim.cat: Add more alredy-defined IEs to ProactiveCmd classes ...................................................................... pySim.cat: Add more alredy-defined IEs to ProactiveCmd classes ... also add some spec references Change-Id: If071abdc61c7c881bdea5292d12c74a1024f6784 --- M pySim/cat.py 1 file changed, 54 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pySim/cat.py b/pySim/cat.py index f2c4a30..2f05b93 100644 --- a/pySim/cat.py +++ b/pySim/cat.py @@ -24,7 +24,7 @@ from construct import Struct, Enum, BitStruct, this from construct import GreedyBytes, Switch, GreedyRange, FlagsEnum from pySim.tlv import TLV_IE, COMPR_TLV_IE, BER_TLV_IE, TLV_IE_Collection -from pySim.construct import PlmnAdapter, BcdAdapter, HexAdapter, GsmStringAdapter, TonNpi +from pySim.construct import PlmnAdapter, BcdAdapter, HexAdapter, GsmStringAdapter, TonNpi, GsmString from pySim.utils import b2h, dec_xplmn_w_act # Tag values as per TS 101 220 Table 7.23 @@ -408,6 +408,10 @@ class ImmediateResponse(COMPR_TLV_IE, tag=0xAB): pass +# TS 102 223 Section 8.44 +class DtmfString(COMPR_TLV_IE, tag=0xAC): + _construct = BcdAdapter(GreedyBytes) + # TS 102 223 Section 8.45 class Language(COMPR_TLV_IE, tag=0xAD): _construct = HexAdapter(GreedyBytes) @@ -417,11 +421,27 @@ _construct = Struct('me_status'/Enum(Int8ub, in_idle_state=0, not_in_idle_state=1), 'timing_advance'/Int8ub) +# TS 31.111 Section 8.47 +class BrowserIdentity(COMPR_TLV_IE, tag=0xB0): + _construct = Enum(Int8ub, default=0, wml=1, html=2, xhtml=3, chtml=4) + +# TS 31.111 Section 8.48 +class Url(COMPR_TLV_IE, tag=0xB1): + _construct = GsmString(GreedyBytes) + # TS 31.111 Section 8.49 class Bearer(COMPR_TLV_IE, tag=0xB2): SingleBearer = Enum(Int8ub, sms=0, csd=1, ussd=2, packet_Service=3) _construct = GreedyRange(SingleBearer) +# TS 102 223 Section 8.50 +class ProvisioningFileReference(COMPR_TLV_IE, tag=0xB3): + _construct = HexAdapter(GreedyBytes) + +# TS 102 223 Section 8.51 +class BrowserTerminationCause(COMPR_TLV_IE, tag=0xB4): + _construct = Enum(Int8ub, user_termination=0, error_termination=1) + # TS 102 223 Section 8.52 class BearerDescription(COMPR_TLV_IE, tag=0xB5): # TS 31.111 Section 8.52.1 @@ -482,7 +502,7 @@ # TS 31.111 Section 8.56 class ChannelStatus(COMPR_TLV_IE, tag = 0xB8): # complex decoding, depends on out-of-band context/knowledge :( - pass + _construct = HexAdapter(GreedyBytes) # TS 102 223 Section 8.58 class OtherAddress(COMPR_TLV_IE, tag = 0xBE): @@ -849,6 +869,7 @@ # TS 102 223 7.5.8 LanguageSelectionEvent # TS 102 223 7.5.9 BrowserTerminationEvent # TS 102 223 7.5.10 DataAvailableEvent + ChannelStatus, ChannelDataLength, # TS 102 223 7.5.11 ChannelStatusEvent # TS 102 223 7.5.12 AccessTechnologyChangeEvent # TS 102 223 7.5.13 DisplayParametersChangedEvent @@ -925,20 +946,24 @@ ApplicationSpecificRefreshData, PlmnWactList, PlmnList]): pass +# TS 102 223 Section 6.6.4 class MoreTime(ProactiveCmd, tag=0x02, - nested=[CommandDetails]): + nested=[CommandDetails, DeviceIdentities]): pass +# TS 102 223 Section 6.6.5 class PollInterval(ProactiveCmd, tag=0x03, - nested=[CommandDetails]): + nested=[CommandDetails, DeviceIdentities, Duration]): pass +# TS 102 223 Section 6.6.14 class PollingOff(ProactiveCmd, tag=0x04, - nested=[CommandDetails]): + nested=[CommandDetails, DeviceIdentities]): pass +# TS 102 223 Section 6.6.16 class SetUpEventList(ProactiveCmd, tag=0x05, - nested=[CommandDetails]): + nested=[CommandDetails, DeviceIdentities, EventList]): pass # TS 31.111 Section 6.6.12 @@ -966,20 +991,27 @@ SMS_TPDU, IconIdentifier, TextAttribute, FrameIdentifier]): pass +# TS 102 223 6.6.24 class SendDTMF(ProactiveCmd, tag=0x14, - nested=[CommandDetails]): + nested=[CommandDetails, DeviceIdentities, AlphaIdentifier, + DtmfString, IconIdentifier, TextAttribute, FrameIdentifier]): pass +# TS 102 223 6.6.26 class LaunchBrowser(ProactiveCmd, tag=0x15, - nested=[CommandDetails]): + nested=[CommandDetails, DeviceIdentities, BrowserIdentity, Url, Bearer, ProvisioningFileReference, + TextString, AlphaIdentifier, IconIdentifier, TextAttribute, FrameIdentifier, + NetworkAccessName]): pass class GeographicalLocationRequest(ProactiveCmd, tag=0x16, nested=[CommandDetails]): pass +# TS 102 223 6.6.5 class PlayTone(ProactiveCmd, tag=0x20, - nested=[CommandDetails]): + nested=[CommandDetails, DeviceIdentities, AlphaIdentifier, + Tone, Duration, IconIdentifier, TextAttribute, FrameIdentifier]): pass # TS 101 220 Table 7.17 + 102 223 6.6.1/9.4 CMD=0x21 @@ -1215,6 +1247,8 @@ nested=[CommandDetails, DeviceIdentities, Result, Duration, TextString, ItemIdentifier, #TODO: LocalInformation and other optional/conditional IEs + ChannelData, ChannelDataLength, + ChannelStatus, BufferSize, BearerDescription, ]): pass -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37138?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: If071abdc61c7c881bdea5292d12c74a1024f6784 Gerrit-Change-Number: 37138 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in pysim[master]: pySim/ota: Don't modify input argument in OtaDialectSms.encode_cmd

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/37139?usp=email ) Change subject: pySim/ota: Don't modify input argument in OtaDialectSms.encode_cmd ...................................................................... pySim/ota: Don't modify input argument in OtaDialectSms.encode_cmd Change-Id: I4c4c44002762696b931ed3580ffe54daf62ffa61 --- M pySim/ota.py 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ota.py b/pySim/ota.py index 10de611..54e8f75 100644 --- a/pySim/ota.py +++ b/pySim/ota.py @@ -332,6 +332,7 @@ len_cipher = 6 + len_sig + len(apdu) padding = otak.crypt._get_padding(len_cipher, otak.crypt.blocksize) pad_cnt = len(padding) + apdu = bytes(apdu) # make a copy so we don't modify the input data apdu += padding kic = {'key': otak.kic_idx, 'algo': otak.algo_crypt} -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37139?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: I4c4c44002762696b931ed3580ffe54daf62ffa61 Gerrit-Change-Number: 37139 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in pysim[master]: pySim.ota.OtaDialectSms: Move SMS header construct up to class level

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/37140?usp=email ) Change subject: pySim.ota.OtaDialectSms: Move SMS header construct up to class level ...................................................................... pySim.ota.OtaDialectSms: Move SMS header construct up to class level this way we can use it in other [future] methods. Change-Id: If296f823c18864fddcfb9cb1b82a087bac8875d4 --- M pySim/ota.py 1 file changed, 13 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/ota.py b/pySim/ota.py index 54e8f75..d77a64e 100644 --- a/pySim/ota.py +++ b/pySim/ota.py @@ -322,6 +322,7 @@ 'response_status'/ResponseStatus, 'cc_rc'/Bytes(this.rhl-10), 'secured_data'/GreedyBytes) + hdr_construct = Struct('chl'/Int8ub, 'spi'/SPI, 'kic'/KIC, 'kid'/KID_CC, 'tar'/Bytes(3)) def encode_cmd(self, otak: OtaKeyset, tar: bytes, spi: dict, apdu: bytes) -> bytes: # length of signature in octets @@ -343,8 +344,7 @@ chl = 13 + len_sig # CHL + SPI (+ KIC + KID) - c = Struct('chl'/Int8ub, 'spi'/SPI, 'kic'/KIC, 'kid'/KID_CC, 'tar'/Bytes(3)) - part_head = c.build({'chl': chl, 'spi':spi, 'kic':kic, 'kid':kid, 'tar':tar}) + part_head = self.hdr_construct.build({'chl': chl, 'spi':spi, 'kic':kic, 'kid':kid, 'tar':tar}) #print("part_head: %s" % b2h(part_head)) # CNTR + PCNTR (CNTR not used) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37140?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: If296f823c18864fddcfb9cb1b82a087bac8875d4 Gerrit-Change-Number: 37140 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in pysim[master]: pySim.tlv.COMPR_TLV_IE: Patch comprehension bit if derived class miss...

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/37145?usp=email ) Change subject: pySim.tlv.COMPR_TLV_IE: Patch comprehension bit if derived class misses it ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37145?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: I299cd65f32dffda9040d18c17a374e8dc9ebe7da Gerrit-Change-Number: 37145 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jun 2024 11:38:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in pysim[master]: pySim.cat: Make sure to always set comprehension bit in COMPR_TLV_IE

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/37144?usp=email ) Change subject: pySim.cat: Make sure to always set comprehension bit in COMPR_TLV_IE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37144?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: I6e5f2a69c960c03015c3f233f8fbc2a7a802f07e Gerrit-Change-Number: 37144 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jun 2024 11:38:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in pysim[master]: pySim.tlv: Correctly parse COMPREHENSION-TLV without comprehension bit

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/37137?usp=email ) Change subject: pySim.tlv: Correctly parse COMPREHENSION-TLV without comprehension bit ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37137?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: I58d04ec13be0c12d9fb8cb3d5a0480d0defb6c95 Gerrit-Change-Number: 37137 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jun 2024 11:38:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in pysim[master]: esim.saip: Add ProfileElementSequence.remove_naas_of_type

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/37010?usp=email ) Change subject: esim.saip: Add ProfileElementSequence.remove_naas_of_type ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37010?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: I64438bf0be58bad7a561c3744b7e9b1338a7857c Gerrit-Change-Number: 37010 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jun 2024 11:38:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in pysim[master]: pySim.ota.OtaDialectSms: Move SMS header construct up to class level

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/37140?usp=email ) Change subject: pySim.ota.OtaDialectSms: Move SMS header construct up to class level ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37140?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: If296f823c18864fddcfb9cb1b82a087bac8875d4 Gerrit-Change-Number: 37140 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jun 2024 11:38:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in pysim[master]: pySim/ota: Don't modify input argument in OtaDialectSms.encode_cmd

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/37139?usp=email ) Change subject: pySim/ota: Don't modify input argument in OtaDialectSms.encode_cmd ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37139?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: I4c4c44002762696b931ed3580ffe54daf62ffa61 Gerrit-Change-Number: 37139 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jun 2024 11:38:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2024