- gerrit-log - lists.osmocom.org

[S] Change in pysim[master]: commands: Ignore exceptions during READ while UPDATE
by laforge 28 Dec '23

28 Dec '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35459?usp=email ) Change subject: commands: Ignore exceptions during READ while UPDATE ...................................................................... commands: Ignore exceptions during READ while UPDATE If we are reading a file to check if we can skip the write to conserve writes, don't treat exceptions as fatal. The file may well have the access mode in a way that permits us to UPDATE but not to READ. Simply fall-back to unconditional UPDATE in this case. Change-Id: I7bffdaa7596e63c8f0ab04a3cb3ebe12f137d3a8 --- M pySim/commands.py 1 file changed, 35 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/59/35459/1 diff --git a/pySim/commands.py b/pySim/commands.py index 336cf0c..d785251 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -279,9 +279,16 @@ # Save write cycles by reading+comparing before write if conserve: - data_current, sw = self.read_binary(ef, data_length, offset) - if data_current == data: - return None, sw + try: + data_current, sw = self.read_binary(ef, data_length, offset) + if data_current == data: + return None, sw + except Exception: + # cannot read data. This is not a fatal error, as reading is just done to + # conserve the amount of smart card writes. The access conditions of the file + # may well permit us to UPDATE but not permit us to READ. So let's ignore + # any such exception during READ. + pass self.select_path(ef) total_data = '' @@ -363,10 +370,17 @@ # Save write cycles by reading+comparing before write if conserve: - data_current, sw = self.read_record(ef, rec_no) - data_current = data_current[0:rec_length*2] - if data_current == data: - return None, sw + try: + data_current, sw = self.read_record(ef, rec_no) + data_current = data_current[0:rec_length*2] + if data_current == data: + return None, sw + except Exception: + # cannot read data. This is not a fatal error, as reading is just done to + # conserve the amount of smart card writes. The access conditions of the file + # may well permit us to UPDATE but not permit us to READ. So let's ignore + # any such exception during READ. + pass pdu = (self.cla_byte + 'dc%02x04%02x' % (rec_no, rec_length)) + data res = self._tp.send_apdu_checksw(pdu) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35459?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: I7bffdaa7596e63c8f0ab04a3cb3ebe12f137d3a8 Gerrit-Change-Number: 35459 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[M] Change in pysim[master]: ts_31_102: Implement decoders/encoders for EFs below DF.HNB
by laforge 28 Dec '23

28 Dec '23

Attention is currently required from: dexter, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35454?usp=email ) Change subject: ts_31_102: Implement decoders/encoders for EFs below DF.HNB ...................................................................... Patch Set 6: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35454?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: Ie57963381e928e2c1da408ad46549a780056242a Gerrit-Change-Number: 35454 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Dec 2023 09:27:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: Fix TLV_IE_Collection.from_tlv in certain situations
by laforge 28 Dec '23

28 Dec '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35455?usp=email ) Change subject: Fix TLV_IE_Collection.from_tlv in certain situations ...................................................................... Fix TLV_IE_Collection.from_tlv in certain situations The existing code used to produce an empty output in situations where a TLV_IE_Collection would be parsed from a single TLV only with some additional trailing padding: >>> from pySim.utils import h2b >>> from pySim.ts_31_102 import EF_CSGT >>> t = EF_CSGT.Csgt_TLV_Collection() >>> t.from_tlv(h2b('8906810300666f6fff')) [TextCsgType(foo)] >>> t.to_dict() [] This was caused by an early return (actually returning the decoded result) but *without updating self.children*. Change-Id: I1c84ccf698c6ff7e7f14242f9aaf7d15ac2239f4 --- M pySim/tlv.py 1 file changed, 25 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/55/35455/1 diff --git a/pySim/tlv.py b/pySim/tlv.py index 4ac5ebf..ccf049e 100644 --- a/pySim/tlv.py +++ b/pySim/tlv.py @@ -361,7 +361,7 @@ # obtain the tag at the start of the remainder tag, r = first._parse_tag_raw(remainder) if tag == None: - return res + break if tag in self.members_by_tag: cls = self.members_by_tag[tag] # create an instance and parse accordingly -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35455?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: I1c84ccf698c6ff7e7f14242f9aaf7d15ac2239f4 Gerrit-Change-Number: 35455 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[M] Change in pysim[master]: tests_files.py: Reduce code duplication
by laforge 28 Dec '23

28 Dec '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35456?usp=email ) Change subject: tests_files.py: Reduce code duplication ...................................................................... tests_files.py: Reduce code duplication Change-Id: Ib84a0ae35262a19fce3e688afe8e1678a4c59eba --- M tests/test_files.py 1 file changed, 26 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/56/35456/1 diff --git a/tests/test_files.py b/tests/test_files.py index 24a80a1..2eaaad1 100755 --- a/tests/test_files.py +++ b/tests/test_files.py @@ -39,6 +39,20 @@ classes = all_subclasses(LinFixedEF) maxDiff = None + @staticmethod + def _parse_t(t): + """Parse a test description which can either be a 2-tuple of (enc, dec) or + a 3-tuple of (enc, rec_nr, dec).""" + if len(t) == 2: + encoded = t[0] + rec_num = 1 + decoded = t[1] + else: + encoded = t[0] + rec_num = t[1] + decoded = t[2] + return encoded, rec_num, decoded + def test_decode_record(self): """Test the decoder for a linear-fixed EF. Requires the given LinFixedEF subclass to have an '_test_decode' attribute, containing a list of tuples. Each tuple can @@ -52,14 +66,7 @@ for t in c._test_decode: with self.subTest(name, test_decode=t): inst = c() - if len(t) == 2: - encoded = t[0] - rec_num = 1 - decoded = t[1] - else: - encoded = t[0] - rec_num = t[1] - decoded = t[2] + encoded, rec_num, decoded = self._parse_t(t) logging.debug("Testing decode of %s", name) re_dec = inst.decode_record_hex(encoded, rec_num) self.assertEqual(decoded, re_dec) @@ -77,14 +84,7 @@ for t in c._test_encode: with self.subTest(name, test_encode=t): inst = c() - if len(t) == 2: - encoded = t[0] - rec_num = 1 - decoded = t[1] - else: - encoded = t[0] - rec_num = t[1] - decoded = t[2] + encoded, rec_num, decoded = self._parse_t(t) logging.debug("Testing encode of %s", name) re_enc = inst.encode_record_hex(decoded, rec_num) self.assertEqual(encoded.upper(), re_enc.upper()) @@ -106,14 +106,7 @@ for t in c._test_de_encode: with self.subTest(name, test_de_encode=t): inst = c() - if len(t) == 2: - encoded = t[0] - rec_num = 1 - decoded = t[1] - else: - encoded = t[0] - rec_num = t[1] - decoded = t[2] + encoded, rec_num, decoded = self._parse_t(t) logging.debug("Testing decode of %s", name) re_dec = inst.decode_record_hex(encoded, rec_num) self.assertEqual(decoded, re_dec) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35456?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: Ib84a0ae35262a19fce3e688afe8e1678a4c59eba Gerrit-Change-Number: 35456 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[M] Change in pysim[master]: test_files: Test decoder also with ff-padded input
by laforge 28 Dec '23

28 Dec '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35457?usp=email ) Change subject: test_files: Test decoder also with ff-padded input ...................................................................... test_files: Test decoder also with ff-padded input It's customary in the SIM card universe to right-pad data with ff bytes. So far we only test decoders without such padding, which is unrealistic. Let's also tests the decoders with extra 'ff' padding present. For some files this doesn't make sense, so we add a _test_no_pad class attribute that can be spcified to prevent this new "test with ff-padding" from being executed for the test data of the class. Change-Id: I7f5cbb4a6f91040fe9adef9da0a1f30f9f156dae --- M pySim/cdma_ruim.py M pySim/ts_102_221.py M pySim/ts_31_102.py M pySim/ts_51_011.py M tests/test_files.py 5 files changed, 70 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/57/35457/1 diff --git a/pySim/cdma_ruim.py b/pySim/cdma_ruim.py index b254403..ad50e60 100644 --- a/pySim/cdma_ruim.py +++ b/pySim/cdma_ruim.py @@ -117,6 +117,7 @@ _test_de_encode = [ ( "000000", { 'ms_operation_mode' : 'normal', 'additional_info' : '0000', 'rfu' : '' } ), ] + _test_no_pad = True class OP_MODE(enum.IntEnum): normal = 0x00 diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index cb02bd3..308fc4a 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -639,6 +639,7 @@ ( '656e', "en" ), ( 'ffff', None ), ] + def __init__(self, fid='2f05', sfid=0x05, name='EF.PL', desc='Preferred Languages'): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=2, size=(2, None)) diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 74fef21..c623bff 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -526,6 +526,7 @@ "marine_guard": False, "mountain_rescue": False, "manual_ecall": False, "automatic_ecall": False } } ), ] + _test_no_pad = True cc_construct = BcdAdapter(Rpad(Bytes(3))) category_construct = FlagsEnum(Byte, police=1, ambulance=2, fire_brigade=3, marine_guard=4, mountain_rescue=5, manual_ecall=6, automatic_ecall=7) @@ -588,6 +589,8 @@ "prose_services": False, "extended_drx": False }, "rfu": 0, "mnc_len": 2, "extensions": b'' } ), ] + _test_no_pad = True + class OP_MODE(enum.IntEnum): normal = 0x00 type_approval = 0x80 diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 6523769..0a6f774 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -141,6 +141,7 @@ "numbering_plan_id": "isdn_e164"}, "dialing_nr": "491721217212", "cap_conf_id": 255, "ext1_record_id": 255} ) ] + _test_no_pad = True def __init__(self, fid='6f3a', sfid=None, name='EF.ADN', desc='Abbreviated Dialing Numbers', ext=1, **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=(14, 30), **kwargs) @@ -215,6 +216,7 @@ "call_number": "" }, "tp_pid": "00", "tp_dcs": "00", "tp_vp_minutes": 1440 } ), ] + _test_no_pad = True class ValidityPeriodAdapter(Adapter): def _decode(self, obj, context, path): if obj <= 143: @@ -565,6 +567,8 @@ ( "00ffff", { "ms_operation_mode": "normal", "rfu1": 255, "rfu2": 127, "ofm": True, "extensions": None } ), ] + _test_no_pad = True + class OP_MODE(enum.IntEnum): normal = 0x00 type_approval = 0x80 @@ -871,6 +875,8 @@ False}, "num_waiting_voicemail": 0, "num_waiting_fax": 0, "num_waiting_email": 0, "num_waiting_other": 0, "num_waiting_videomail": None} ), ] + _test_no_pad = True + def __init__(self, fid='6fca', sfid=None, name='EF.MWIS', rec_len=(5, 6), desc='Message Waiting Indication Status', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) diff --git a/tests/test_files.py b/tests/test_files.py index 2eaaad1..9fdb022 100755 --- a/tests/test_files.py +++ b/tests/test_files.py @@ -64,12 +64,20 @@ name = get_qualified_name(c) if hasattr(c, '_test_decode'): for t in c._test_decode: + encoded, rec_num, decoded = self._parse_t(t) with self.subTest(name, test_decode=t): inst = c() - encoded, rec_num, decoded = self._parse_t(t) logging.debug("Testing decode of %s", name) re_dec = inst.decode_record_hex(encoded, rec_num) self.assertEqual(decoded, re_dec) + if hasattr(c, '_test_no_pad') and c._test_no_pad: + continue + with self.subTest(name, test_decode_padded=t): + encoded = encoded + 'ff' + inst = c() + logging.debug("Testing padded decode of %s", name) + re_dec = inst.decode_record_hex(encoded, rec_num) + self.assertEqual(decoded, re_dec) def test_encode_record(self): """Test the encoder for a linear-fixed EF. Requires the given LinFixedEF subclass @@ -104,9 +112,9 @@ name = get_qualified_name(c) if hasattr(c, '_test_de_encode'): for t in c._test_de_encode: + encoded, rec_num, decoded = self._parse_t(t) with self.subTest(name, test_de_encode=t): inst = c() - encoded, rec_num, decoded = self._parse_t(t) logging.debug("Testing decode of %s", name) re_dec = inst.decode_record_hex(encoded, rec_num) self.assertEqual(decoded, re_dec) @@ -114,6 +122,14 @@ logging.debug("Testing re-encode of %s", name) re_enc = inst.encode_record_hex(re_dec, rec_num) self.assertEqual(encoded.upper(), re_enc.upper()) + if hasattr(c, '_test_no_pad') and c._test_no_pad: + continue + with self.subTest(name, test_decode_padded=t): + encoded = encoded + 'ff' + inst = c() + logging.debug("Testing padded decode of %s", name) + re_dec = inst.decode_record_hex(encoded, rec_num) + self.assertEqual(decoded, re_dec) class TransRecEF_Test(unittest.TestCase): @@ -136,6 +152,8 @@ logging.debug("Testing decode of %s", name) re_dec = inst.decode_record_hex(encoded) self.assertEqual(decoded, re_dec) + # there's no point in testing padded input, as TransRecEF have a fixed record + # size and we cannot ever receive more input data than that size. def test_encode_record(self): """Test the encoder for a transparent record-oriented EF. Requires the given TransRecEF subclass @@ -178,6 +196,8 @@ logging.debug("Testing re-encode of %s", name) re_enc = inst.encode_record_hex(re_dec) self.assertEqual(encoded.upper(), re_enc.upper()) + # there's no point in testing padded input, as TransRecEF have a fixed record + # size and we cannot ever receive more input data than that size. class TransparentEF_Test(unittest.TestCase): @@ -204,13 +224,21 @@ name = get_qualified_name(c) if hasattr(c, '_test_decode'): for t in c._test_decode: + encoded = t[0] + decoded = t[1] with self.subTest(name, test_decode=t): inst = c() - encoded = t[0] - decoded = t[1] logging.debug("Testing decode of %s", name) re_dec = inst.decode_hex(encoded) self.assertEqual(decoded, re_dec) + if hasattr(c, '_test_no_pad') and c._test_no_pad: + continue + with self.subTest(name, test_decode_padded=t): + encoded = encoded + 'ff' + inst = c() + logging.debug("Testing padded decode of %s", name) + re_dec = inst.decode_hex(encoded) + self.assertEqual(decoded, re_dec) def test_encode_file(self): """Test the encoder for a transparent EF. Requires the given TransparentEF subclass @@ -241,10 +269,10 @@ name = get_qualified_name(c) if hasattr(c, '_test_de_encode'): for t in c._test_de_encode: + encoded = t[0] + decoded = t[1] with self.subTest(name, test_de_encode=t): inst = c() - encoded = t[0] - decoded = t[1] logging.debug("Testing decode of %s", name) re_dec = inst.decode_hex(encoded) self.assertEqual(decoded, re_dec) @@ -252,7 +280,14 @@ re_dec = inst.decode_hex(encoded) re_enc = inst.encode_hex(re_dec) self.assertEqual(encoded.upper(), re_enc.upper()) - + if hasattr(c, '_test_no_pad') and c._test_no_pad: + continue + with self.subTest(name, test_decode_padded=t): + encoded = encoded + 'ff' + inst = c() + logging.debug("Testing padded decode of %s", name) + re_dec = inst.decode_hex(encoded) + self.assertEqual(decoded, re_dec) if __name__ == '__main__': logger = logging.getLogger() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35457?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: I7f5cbb4a6f91040fe9adef9da0a1f30f9f156dae Gerrit-Change-Number: 35457 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[M] Change in pysim[master]: Implement convoluted encoding of UCS-2 as per TS 102 221 Annex A
by laforge 28 Dec '23

28 Dec '23

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/35452?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Implement convoluted encoding of UCS-2 as per TS 102 221 Annex A ...................................................................... Implement convoluted encoding of UCS-2 as per TS 102 221 Annex A TS 102 221 Annex A defines three variants of encoding UCS-2 characters into byte streams in files on UICC cards: One rather simplistic one, and two variants for optimizing memory utilization on the card. Let's impelement a construct "Ucs2Adapter" class for this. Change-Id: Ic8bc8f71079faec1bf0e538dc0dfa21403869c6d --- M pySim/construct.py M tests/test_construct.py 2 files changed, 215 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/52/35452/5 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35452?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: Ic8bc8f71079faec1bf0e538dc0dfa21403869c6d Gerrit-Change-Number: 35452 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0

[M] Change in pysim[master]: Implement convoluted encoding of UCS-2 as per TS 102 221 Annex A
by laforge 28 Dec '23

28 Dec '23

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/35452?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Implement convoluted encoding of UCS-2 as per TS 102 221 Annex A ...................................................................... Implement convoluted encoding of UCS-2 as per TS 102 221 Annex A TS 102 221 Annex A defines three variants of encoding UCS-2 characters into byte streams in files on UICC cards: One rather simplistic one, and two variants for optimizing memory utilization on the card. Let's impelement a construct "Ucs2Adapter" class for this. Change-Id: Ic8bc8f71079faec1bf0e538dc0dfa21403869c6d --- M pySim/construct.py M tests/test_construct.py 2 files changed, 215 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/52/35452/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35452?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: Ic8bc8f71079faec1bf0e538dc0dfa21403869c6d Gerrit-Change-Number: 35452 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0

[M] Change in pysim[master]: Implement convoluted encoding of UCS-2 as per TS 102 221 Annex A
by laforge 28 Dec '23

28 Dec '23

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/35452?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Implement convoluted encoding of UCS-2 as per TS 102 221 Annex A ...................................................................... Implement convoluted encoding of UCS-2 as per TS 102 221 Annex A TS 102 221 Annex A defines three variants of encoding UCS-2 characters into byte streams in files on UICC cards: One rather simplistic one, and two variants for optimizing memory utilization on the card. Let's impelement a construct "Ucs2Adapter" class for this. Change-Id: Ic8bc8f71079faec1bf0e538dc0dfa21403869c6d --- M pySim/construct.py M tests/test_construct.py 2 files changed, 215 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/52/35452/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35452?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: Ic8bc8f71079faec1bf0e538dc0dfa21403869c6d Gerrit-Change-Number: 35452 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0

[M] Change in pysim[master]: add PlmnAdapter for decoding PLMN bcd-strings like 262f01 to 262-01
by laforge 28 Dec '23

28 Dec '23

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/35451?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: add PlmnAdapter for decoding PLMN bcd-strings like 262f01 to 262-01 ...................................................................... add PlmnAdapter for decoding PLMN bcd-strings like 262f01 to 262-01 The human representation of a PLMN is usually MCC-MNC like 262-01 or 262-001. Let's add a PlmnAdapter for use within construct, so we can properly decode that. Change-Id: I96f276e6dcdb54a5a3d2bcde5ee6dbaf981ed789 --- M pySim/cat.py M pySim/construct.py M pySim/gsm_r.py M pySim/ts_31_102.py M pySim/ts_51_011.py M pysim-testdata/pySim-trace_test_gsmtap.pcapng.ok 6 files changed, 47 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/51/35451/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35451?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: I96f276e6dcdb54a5a3d2bcde5ee6dbaf981ed789 Gerrit-Change-Number: 35451 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0

[S] Change in pysim[master]: Fix enumeration of GlobbalPlatformISDR during card_init()
by laforge 28 Dec '23

28 Dec '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35440?usp=email ) Change subject: Fix enumeration of GlobbalPlatformISDR during card_init() ...................................................................... Fix enumeration of GlobbalPlatformISDR during card_init() We used __subclasses__(), but this only returns the immediate subclasses and not all further/nested subclasses. Instead, we must use the pySim.utils.all_subclasses() function to really get all of them. The hack to use the method signature of the constructor to determine if it's an intermediate class didn't work, as even GlobbalPlatformISDR has a optional argument for non-default AIDs. So let's introduce an explicit class attribute for that purpose. Change-Id: I7fb1637f8f7a149b536c4d77dac92736c526aa6c --- M pySim/app.py M pySim/global_platform.py 2 files changed, 22 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/pySim/app.py b/pySim/app.py index b0df85f..43ef06d 100644 --- a/pySim/app.py +++ b/pySim/app.py @@ -14,7 +14,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -import inspect from typing import Tuple from pySim.transport import LinkBase @@ -26,6 +25,7 @@ from pySim.profile import CardProfile from pySim.cdma_ruim import CardProfileRUIM from pySim.ts_102_221 import CardProfileUICC +from pySim.utils import all_subclasses # we need to import this module so that the SysmocomSJA2 sub-class of # CardModel is created, which will add the ATR-based matching and @@ -87,10 +87,9 @@ # We cannot do it within pySim/profile.py as that would create circular # dependencies between the individual profiles and profile.py. if isinstance(profile, CardProfileUICC): - for app_cls in CardApplication.__subclasses__(): - constr_sig = inspect.signature(app_cls.__init__) + for app_cls in all_subclasses(CardApplication): # skip any intermediary sub-classes such as CardApplicationSD - if len(constr_sig.parameters) != 1: + if hasattr(app_cls, '_' + app_cls.__name__ + '__intermediate'): continue profile.add_application(app_cls()) # We have chosen SimCard() above, but we now know it actually is an UICC diff --git a/pySim/global_platform.py b/pySim/global_platform.py index 2ed6ee4..0ceb884 100644 --- a/pySim/global_platform.py +++ b/pySim/global_platform.py @@ -267,6 +267,7 @@ # Card Application of a Security Domain class CardApplicationSD(CardApplication): + __intermediate = True def __init__(self, aid: str, name: str, desc: str): super().__init__(name, adf=ADF_SD(aid, name, desc), sw=sw_table) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35440?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: I7fb1637f8f7a149b536c4d77dac92736c526aa6c Gerrit-Change-Number: 35440 Gerrit-PatchSet: 3 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

1 0

2026

2025

2024

2023

2022

gerrit-log