- gerrit-log - lists.osmocom.org

[XS] Change in pysim[master]: global_platform: fix s/GET/STORE/ DATA in docs
by fixeria 15 Mar '26

15 Mar '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42376?usp=email ) Change subject: global_platform: fix s/GET/STORE/ DATA in docs ...................................................................... global_platform: fix s/GET/STORE/ DATA in docs Both `do_store_data` and `store_data` have identical docstrings that incorrectly describe the command as GET DATA. Should be "STORE DATA". Take a chance to fix missing space between `v2.3` and `Section`. Change-Id: I33fc80ab8ca50fadc38217b0005eec6169c8e34e --- M pySim/global_platform/__init__.py 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/76/42376/1 diff --git a/pySim/global_platform/__init__.py b/pySim/global_platform/__init__.py index a836134..22554c6 100644 --- a/pySim/global_platform/__init__.py +++ b/pySim/global_platform/__init__.py @@ -562,14 +562,14 @@ @cmd2.with_argparser(store_data_parser) def do_store_data(self, opts): - """Perform the GlobalPlatform GET DATA command in order to store some card-specific data. - See GlobalPlatform CardSpecification v2.3Section 11.11 for details.""" + """Perform the GlobalPlatform STORE DATA command in order to store some card-specific data. + See GlobalPlatform CardSpecification v2.3 Section 11.11 for details.""" response_permitted = opts.response == 'may_be_returned' self.store_data(h2b(opts.DATA), opts.data_structure, opts.encryption, response_permitted) def store_data(self, data: bytes, structure:str = 'none', encryption:str = 'none', response_permitted: bool = False) -> bytes: - """Perform the GlobalPlatform GET DATA command in order to store some card-specific data. - See GlobalPlatform CardSpecification v2.3Section 11.11 for details.""" + """Perform the GlobalPlatform STORE DATA command in order to store some card-specific data. + See GlobalPlatform CardSpecification v2.3 Section 11.11 for details.""" max_cmd_len = self._cmd.lchan.scc.max_cmd_len # Table 11-89 of GP Card Specification v2.3 remainder = data -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42376?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: I33fc80ab8ca50fadc38217b0005eec6169c8e34e Gerrit-Change-Number: 42376 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in pysim[master]: global_platform: refactor gen_install_parameters()
by fixeria 15 Mar '26

15 Mar '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42378?usp=email ) Change subject: global_platform: refactor gen_install_parameters() ...................................................................... global_platform: refactor gen_install_parameters() Change-Id: I8756fb38016cdf0527fe2e21edb44381d1dc557f --- M pySim/global_platform/install_param.py 1 file changed, 14 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/78/42378/1 diff --git a/pySim/global_platform/install_param.py b/pySim/global_platform/install_param.py index 89e6c7f..fc96792 100644 --- a/pySim/global_platform/install_param.py +++ b/pySim/global_platform/install_param.py @@ -17,6 +17,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # +from typing import Optional + from osmocom.construct import * from osmocom.utils import * from osmocom.tlv import * @@ -46,7 +48,9 @@ # GPD_SPE_013, table 11-49 pass -def gen_install_parameters(non_volatile_memory_quota:int, volatile_memory_quota:int, stk_parameter:str): +def gen_install_parameters(non_volatile_memory_quota: Optional[int] = None, + volatile_memory_quota: Optional[int] = None, + stk_parameter: Optional[str] = None): # GPD_SPE_013, table 11-49 @@ -54,19 +58,15 @@ install_params = InstallParams() install_params_dict = [{'app_specific_params': None}] - #Conditional - if non_volatile_memory_quota and volatile_memory_quota and stk_parameter: - system_specific_params = [] - #Optional - if non_volatile_memory_quota: - system_specific_params += [{'non_volatile_memory_quota': non_volatile_memory_quota}] - #Optional - if volatile_memory_quota: - system_specific_params += [{'volatile_memory_quota': volatile_memory_quota}] - #Optional - if stk_parameter: - system_specific_params += [{'stk_parameter': stk_parameter}] - install_params_dict += [{'system_specific_params': system_specific_params}] + system_specific_params = [] + if non_volatile_memory_quota is not None: + system_specific_params.append({'non_volatile_memory_quota': non_volatile_memory_quota}) + if volatile_memory_quota is not None: + system_specific_params.append({'volatile_memory_quota': volatile_memory_quota}) + if stk_parameter is not None: + system_specific_params.append({'stk_parameter': stk_parameter}) + if system_specific_params: + install_params_dict.append({'system_specific_params': system_specific_params}) install_params.from_dict(install_params_dict) return b2h(install_params.to_bytes()) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42378?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: I8756fb38016cdf0527fe2e21edb44381d1dc557f Gerrit-Change-Number: 42378 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: global_platform: fix docstring for Scp03SessionKeys._get_icv()
by fixeria 15 Mar '26

15 Mar '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42377?usp=email ) Change subject: global_platform: fix docstring for Scp03SessionKeys._get_icv() ...................................................................... global_platform: fix docstring for Scp03SessionKeys._get_icv() Change-Id: I8983bc27f581295544360ba8b4ae1d28b3ea850f --- M pySim/global_platform/scp.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/77/42377/1 diff --git a/pySim/global_platform/scp.py b/pySim/global_platform/scp.py index 124b4c5..6c267fa 100644 --- a/pySim/global_platform/scp.py +++ b/pySim/global_platform/scp.py @@ -438,7 +438,7 @@ """Obtain the ICV value computed as described in 6.2.6. This method has two modes: * is_response=False for computing the ICV for C-ENC. Will pre-increment the counter. - * is_response=False for computing the ICV for R-DEC.""" + * is_response=True for computing the ICV for R-DEC.""" if not is_response: self.block_nr += 1 # The binary value of this number SHALL be left padded with zeroes to form a full block. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42377?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: I8983bc27f581295544360ba8b4ae1d28b3ea850f Gerrit-Change-Number: 42377 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in pysim[master]: sms: fix flags_construct in SMS_DELIVER
by fixeria 15 Mar '26

15 Mar '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42381?usp=email ) Change subject: sms: fix flags_construct in SMS_DELIVER ...................................................................... sms: fix flags_construct in SMS_DELIVER * field `tp_rp` appears at bit positions 7 and 5 ** bit 7 should be `tp_rp` (Reply Path) ** bit 5 should be `tp_sri` (Status Report Indication) * field `tp_lp` is completely missing ** should be at bit position 3 Change-Id: I0274849f0fa07281b5e050af429ffda7d249f9e8 --- M pySim/sms.py 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/81/42381/1 diff --git a/pySim/sms.py b/pySim/sms.py index aefc874..62601b0 100644 --- a/pySim/sms.py +++ b/pySim/sms.py @@ -169,8 +169,14 @@ class SMS_DELIVER(SMS_TPDU): """Representation of a SMS-DELIVER T-PDU. This is the Network to MS/UE (downlink) direction.""" - flags_construct = BitStruct('tp_rp'/Flag, 'tp_udhi'/Flag, 'tp_rp'/Flag, 'tp_sri'/Flag, - Padding(1), 'tp_mms'/Flag, 'tp_mti'/BitsInteger(2)) + flags_construct = BitStruct('tp_rp'/Flag, + 'tp_udhi'/Flag, + 'tp_sri'/Flag, + Padding(1), + 'tp_lp'/Flag, + 'tp_mms'/Flag, + 'tp_mti'/BitsInteger(2)) + def __init__(self, **kwargs): kwargs['tp_mti'] = 0 super().__init__(**kwargs) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42381?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: I0274849f0fa07281b5e050af429ffda7d249f9e8 Gerrit-Change-Number: 42381 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in pysim[master]: ara_m: fix exceptions not being raised properly
by fixeria 15 Mar '26

15 Mar '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42379?usp=email ) Change subject: ara_m: fix exceptions not being raised properly ...................................................................... ara_m: fix exceptions not being raised properly Exceptions are meant to be thrown/raised, not returned. Change-Id: Id799c264447e22887edcd2dc7eb991cf0af1bbfc --- M pySim/ara_m.py 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/79/42379/1 diff --git a/pySim/ara_m.py b/pySim/ara_m.py index b338c43..aa41268 100644 --- a/pySim/ara_m.py +++ b/pySim/ara_m.py @@ -72,10 +72,10 @@ if do[0] == 0x01: self.decoded = {'generic_access_rule': 'always'} return self.decoded - return ValueError('Invalid 1-byte generic APDU access rule') + raise ValueError('Invalid 1-byte generic APDU access rule') else: if len(do) % 8: - return ValueError('Invalid non-modulo-8 length of APDU filter: %d' % len(do)) + raise ValueError('Invalid non-modulo-8 length of APDU filter: %d' % len(do)) self.decoded = {'apdu_filter': []} offset = 0 while offset < len(do): @@ -90,19 +90,19 @@ return b'\x00' if self.decoded['generic_access_rule'] == 'always': return b'\x01' - return ValueError('Invalid 1-byte generic APDU access rule') + raise ValueError('Invalid 1-byte generic APDU access rule') else: if not 'apdu_filter' in self.decoded: - return ValueError('Invalid APDU AR DO') + raise ValueError('Invalid APDU AR DO') filters = self.decoded['apdu_filter'] res = b'' for f in filters: if not 'header' in f or not 'mask' in f: - return ValueError('APDU filter must contain header and mask') + raise ValueError('APDU filter must contain header and mask') header_b = h2b(f['header']) mask_b = h2b(f['mask']) if len(header_b) != 4 or len(mask_b) != 4: - return ValueError('APDU filter header and mask must each be 4 bytes') + raise ValueError('APDU filter header and mask must each be 4 bytes') res += header_b + mask_b return res @@ -269,7 +269,7 @@ cmd_do_enc = cmd_do.to_ie() cmd_do_len = len(cmd_do_enc) if cmd_do_len > 255: - return ValueError('DO > 255 bytes not supported yet') + raise ValueError('DO > 255 bytes not supported yet') else: cmd_do_enc = b'' cmd_do_len = 0 @@ -361,7 +361,7 @@ ar_do_content += [{'apdu_ar_do': {'generic_access_rule': 'always'}}] elif opts.apdu_filter: if len(opts.apdu_filter) % 16: - return ValueError('Invalid non-modulo-16 length of APDU filter: %d' % len(do)) + raise ValueError('Invalid non-modulo-16 length of APDU filter: %d' % len(do)) offset = 0 apdu_filter = [] while offset < len(opts.apdu_filter): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42379?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: Id799c264447e22887edcd2dc7eb991cf0af1bbfc Gerrit-Change-Number: 42379 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: ara_m: fix undefined variable used in a format-string
by fixeria 15 Mar '26

15 Mar '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42380?usp=email ) Change subject: ara_m: fix undefined variable used in a format-string ...................................................................... ara_m: fix undefined variable used in a format-string Change-Id: I310a5d461bae2b5e4d8e07097000b079c23aa0f6 --- M pySim/ara_m.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/80/42380/1 diff --git a/pySim/ara_m.py b/pySim/ara_m.py index aa41268..e1c26f6 100644 --- a/pySim/ara_m.py +++ b/pySim/ara_m.py @@ -361,7 +361,7 @@ ar_do_content += [{'apdu_ar_do': {'generic_access_rule': 'always'}}] elif opts.apdu_filter: if len(opts.apdu_filter) % 16: - raise ValueError('Invalid non-modulo-16 length of APDU filter: %d' % len(do)) + raise ValueError(f'Invalid non-modulo-16 length of APDU filter: {len(opts.apdu_filter)}') offset = 0 apdu_filter = [] while offset < len(opts.apdu_filter): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42380?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: I310a5d461bae2b5e4d8e07097000b079c23aa0f6 Gerrit-Change-Number: 42380 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: ota: OtaAlgo{Crypt,Auth}: fix algo_auth vs algo_crypt
by fixeria 15 Mar '26

15 Mar '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42382?usp=email ) Change subject: ota: OtaAlgo{Crypt,Auth}: fix algo_auth vs algo_crypt ...................................................................... ota: OtaAlgo{Crypt,Auth}: fix algo_auth vs algo_crypt * OtaAlgoCrypt.from_keyset() searches by `otak.algo_crypt` but the error message prints `otak.algo_auth`. Should be `otak.algo_crypt` instead. * OtaAlgoAuth.__init__() checks `algo_auth` but the error message prints `algo_crypt`. Should be `otak.algo_auth` instead. Change-Id: Ia636fffaeadc68e3f6d5b65d477e753834c95895 --- M pySim/ota.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/82/42382/1 diff --git a/pySim/ota.py b/pySim/ota.py index fbb9d45..3d2da15 100644 --- a/pySim/ota.py +++ b/pySim/ota.py @@ -221,12 +221,12 @@ for subc in cls.__subclasses__(): if subc.enum_name == otak.algo_crypt: return subc(otak) - raise ValueError('No implementation for crypt algorithm %s' % otak.algo_auth) + raise ValueError('No implementation for crypt algorithm %s' % otak.algo_crypt) class OtaAlgoAuth(OtaAlgo, abc.ABC): def __init__(self, otak: OtaKeyset): if self.enum_name != otak.algo_auth: - raise ValueError('Cannot use algorithm %s with key for %s' % (self.enum_name, otak.algo_crypt)) + raise ValueError('Cannot use algorithm %s with key for %s' % (self.enum_name, otak.algo_auth)) super().__init__(otak) def sign(self, data:bytes) -> bytes: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42382?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: Ia636fffaeadc68e3f6d5b65d477e753834c95895 Gerrit-Change-Number: 42382 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: utils: dec_plmn(): remove redundant call
by fixeria 15 Mar '26

15 Mar '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42383?usp=email ) Change subject: utils: dec_plmn(): remove redundant call ...................................................................... utils: dec_plmn(): remove redundant call Change-Id: Ic95c3992ed57eb8fee952ec2dc7f092dd7689579 --- M pySim/utils.py 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/83/42383/1 diff --git a/pySim/utils.py b/pySim/utils.py index 1fdcefe..0417366 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -139,7 +139,6 @@ def dec_plmn(threehexbytes: Hexstr) -> dict: res = {'mcc': "0", 'mnc': "0"} - dec_mcc_from_plmn_str(threehexbytes) res['mcc'] = dec_mcc_from_plmn_str(threehexbytes) res['mnc'] = dec_mnc_from_plmn_str(threehexbytes) return res -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42383?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: Ic95c3992ed57eb8fee952ec2dc7f092dd7689579 Gerrit-Change-Number: 42383 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: utils: DataObjectCollection.encode(): fix TypeError
by fixeria 15 Mar '26

15 Mar '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42384?usp=email ) Change subject: utils: DataObjectCollection.encode(): fix TypeError ...................................................................... utils: DataObjectCollection.encode(): fix TypeError `members_by_name` is a plain dictionary. Calling it with `()` raises: TypeError: 'dict' object is not callable Change-Id: I7e0c09aa7303f1506fe3a025fdc3779919dd0e6c --- M pySim/utils.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/84/42384/1 diff --git a/pySim/utils.py b/pySim/utils.py index 0417366..519d73c 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -910,7 +910,8 @@ def encode(self, decoded) -> bytes: res = bytearray() for i in decoded: - obj = self.members_by_name(i[0]) + name = i[0] + obj = self.members_by_name[name] res.append(obj.to_tlv()) return res -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42384?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: I7e0c09aa7303f1506fe3a025fdc3779919dd0e6c Gerrit-Change-Number: 42384 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: ts_51_011: EF.EXT[6-7]: fix typo in desc
by fixeria 15 Mar '26

15 Mar '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42385?usp=email ) Change subject: ts_51_011: EF.EXT[6-7]: fix typo in desc ...................................................................... ts_51_011: EF.EXT[6-7]: fix typo in desc Change-Id: I93df1c9fd8a4d588ed7ed19ec2dc1d304412fc3d --- M pySim/ts_51_011.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/85/42385/1 diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 70c38b1..e5ffdd4 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -1117,8 +1117,8 @@ EF_MBI(), EF_MWIS(), EF_CFIS(), - EF_EXT('6fc8', None, 'EF.EXT6', desc='Externsion6 (MBDN)'), - EF_EXT('6fcc', None, 'EF.EXT7', desc='Externsion7 (CFIS)'), + EF_EXT('6fc8', None, 'EF.EXT6', desc='Extension6 (MBDN)'), + EF_EXT('6fcc', None, 'EF.EXT7', desc='Extension7 (CFIS)'), EF_SPDI(), EF_MMSN(), EF_EXT('6fcf', None, 'EF.EXT8', desc='Extension8 (MMSN)'), -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42385?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: I93df1c9fd8a4d588ed7ed19ec2dc1d304412fc3d Gerrit-Change-Number: 42385 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log