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

[S] Change in pysim[master]: Fix enumeration of GlobbalPlatformISDR during card_init()

by fixeria

Attention is currently required from: dexter, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35440?usp=email ) Change subject: Fix enumeration of GlobbalPlatformISDR during card_init() ...................................................................... Patch Set 1: (1 comment) File pySim/global_platform.py: https://gerrit.osmocom.org/c/pysim/+/35440/comment/98c6e6a5_f0f8d0c1 PS1, Line 262: intermediate = False > Something that only exists in CardApplicationSD but not any derived classes. This can be done by making `intermediate` private by renaming it to `__intermediate`. This prefix makes fields and methods somewhat special: ``` class Parent: # this field can be accessed as self.__intermediate by methods of this class, # but not by methods of child classes and not from the outside __intermediate = True class Child(Parent): pass >>> Parent.__intermediate # yields AttributeError >>> Child.__intermediate # yields AttributeError >>> Parent._Parent__intermediate # True >>> Child._Parent__intermediate # True >>> Child._Child__intermediate # yields AttributeError ``` As can be seen, `Child` class still does inherit field `__intermediate`, but Python prepends the parent class name to it. So you can use this when iterating over the sub-classes of `CardApplication`: ``` if hasattr(app_cls, '_' + app_cls.__name__ + '__intermediate'): continue # skip intermediate classes ``` See also: https://stackoverflow.com/questions/20261517/inheritance-of-private-and-pro…. -- 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: 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Dec 2023 16:01:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in pysim[master]: Add TLV decoder test data

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35442?usp=email ) Change subject: Add TLV decoder test data ...................................................................... Add TLV decoder test data This adds some first test data for the new unitdata driven test cases for the TLV encoder/decoder. It also fixes a bug in the ts_102_221.FileDescriptor decoder for BER-TLV structured files which was found and fixed while introducing the test data. Related: OS#6317 Change-Id: Ief156b7e466a772c78fb632b2fa00cba2eb1eba5 --- M pySim/ts_102_221.py 1 file changed, 36 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index 67381f3..cb02bd3 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -90,14 +90,24 @@ # ETSI TS 102 221 11.1.1.4.3 class FileDescriptor(BER_TLV_IE, tag=0x82): + _test_decode = [ + # FIXME: this doesn't work as _encode test for some strange reason. + ( '82027921', { "file_descriptor_byte": { "shareable": True, "structure": "ber_tlv" }, "record_len": None, "num_of_rec": None } ), + ] + _test_de_encode = [ + ( '82027821', { "file_descriptor_byte": { "shareable": True, "file_type": "df", "structure": "no_info_given" }, "record_len": None, "num_of_rec": None }), + ( '82024121', { "file_descriptor_byte": { "shareable": True, "file_type": "working_ef", "structure": "transparent" }, "record_len": None, "num_of_rec": None } ), + ( '82054221006e05', { "file_descriptor_byte": { "shareable": True, "file_type": "working_ef", "structure": "linear_fixed" }, "record_len": 110, "num_of_rec": 5 } ), + ] class BerTlvAdapter(Adapter): def _parse(self, obj, context, path): - if obj == 0x39: + data = obj.read() + if data == b'\x01\x01\x01\x00\x00\x01': return 'ber_tlv' raise ValidationError def _build(self, obj, context, path): if obj == 'ber_tlv': - return 0x39 + return b'\x01\x01\x01\x00\x00\x01' raise ValidationError FDB = Select(BitStruct(Const(0, Bit), 'shareable'/Flag, 'structure'/BerTlvAdapter(Const(0x39, BitsInteger(6)))), @@ -200,6 +210,9 @@ # ETSI TS 102 221 11.1.1.4.9 class LifeCycleStatusInteger(BER_TLV_IE, tag=0x8A): + _test_de_encode = [ + ( '8a0105', 'operational_activated' ), + ] def _from_bytes(self, do: bytes): lcsi = int.from_bytes(do, 'big') if lcsi == 0x00: @@ -583,6 +596,10 @@ { "application_label": "USim1" }, { "discretionary_template": h2b("a00c80011781025f608203454150") } ] } ), + ( '61194f10a0000000871004ffffffff890709000050054953696d31', + { "application_template": [ { "application_id": h2b("a0000000871004ffffffff8907090000") }, + { "application_label": "ISim1" } ] } + ), ] class ApplicationLabel(BER_TLV_IE, tag=0x50): # TODO: UCS-2 coding option as per Annex A of TS 102 221 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35442?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: Ief156b7e466a772c78fb632b2fa00cba2eb1eba5 Gerrit-Change-Number: 35442 Gerrit-PatchSet: 3 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-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in pysim[master]: global_platform: Add TLV test data for Key Information Data

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35449?usp=email ) Change subject: global_platform: Add TLV test data for Key Information Data ...................................................................... global_platform: Add TLV test data for Key Information Data Change-Id: Ib7b73cb28abea98986a66264a0779263873d7fb2 --- M pySim/global_platform.py M tests/test_tlvs.py 2 files changed, 23 insertions(+), 14 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/global_platform.py b/pySim/global_platform.py index b564770..8daf927 100644 --- a/pySim/global_platform.py +++ b/pySim/global_platform.py @@ -80,21 +80,20 @@ not_available=0xff) # GlobalPlatform 2.1.1 Section 9.3.3.1 -# example: -# e0 48 -# c0 04 01708010 -# c0 04 02708010 -# c0 04 03708010 -# c0 04 01018010 -# c0 04 02018010 -# c0 04 03018010 -# c0 04 01028010 -# c0 04 02028010 -# c0 04 03028010 -# c0 04 01038010 -# c0 04 02038010 -# c0 04 03038010 class KeyInformationData(BER_TLV_IE, tag=0xc0): + _test_de_encode = [ + ( 'c00401708010', {"key_identifier": 1, "key_version_number": 112, "key_types": [ {"length": 16, "type": "des"} ]} ), + ( 'c00402708010', {"key_identifier": 2, "key_version_number": 112, "key_types": [ {"length": 16, "type": "des"} ]} ), + ( 'c00403708010', {"key_identifier": 3, "key_version_number": 112, "key_types": [ {"length": 16, "type": "des"} ]} ), + ( 'c00401018010', {"key_identifier": 1, "key_version_number": 1, "key_types": [ {"length": 16, "type": "des"} ]} ), + ( 'c00402018010', {"key_identifier": 2, "key_version_number": 1, "key_types": [ {"length": 16, "type": "des"} ]} ), + ( 'c00403018010', {"key_identifier": 3, "key_version_number": 1, "key_types": [ {"length": 16, "type": "des"} ]} ), + ( 'c00401028010', {"key_identifier": 1, "key_version_number": 2, "key_types": [ {"length": 16, "type": "des"} ]} ), + ( 'c00402028010', {"key_identifier": 2, "key_version_number": 2, "key_types": [ {"length": 16, "type": "des"} ]} ), + ( 'c00403038010', {"key_identifier": 3, "key_version_number": 3, "key_types": [ {"length": 16, "type": "des"} ]} ), + ( 'c00401038010', {"key_identifier": 1, "key_version_number": 3, "key_types": [ {"length": 16, "type": "des"} ]} ), + ( 'c00402038010', {"key_identifier": 2, "key_version_number": 3, "key_types": [ {"length": 16, "type": "des"} ]} ), + ] KeyTypeLen = Struct('type'/KeyType, 'length'/Int8ub) _construct = Struct('key_identifier'/Byte, 'key_version_number'/Byte, 'key_types'/GreedyRange(KeyTypeLen)) diff --git a/tests/test_tlvs.py b/tests/test_tlvs.py index b0ad48a..a0dd107 100755 --- a/tests/test_tlvs.py +++ b/tests/test_tlvs.py @@ -30,6 +30,7 @@ import pySim.sysmocom_sja2 import pySim.gsm_r import pySim.cdma_ruim +import pySim.global_platform if 'unittest.util' in __import__('sys').modules: # Show full diff in self.assertEqual. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35449?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: Ib7b73cb28abea98986a66264a0779263873d7fb2 Gerrit-Change-Number: 35449 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in pysim[master]: global_platform: Correctly decode Key Information Data

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35448?usp=email ) Change subject: global_platform: Correctly decode Key Information Data ...................................................................... global_platform: Correctly decode Key Information Data The list contains tuples of (key_type, key_length). Let's fix that. Change-Id: Icf367827d62ed67afa27ee3d0ba9d5cd5bc65c99 --- M pySim/global_platform.py 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/global_platform.py b/pySim/global_platform.py index 136cccc..b564770 100644 --- a/pySim/global_platform.py +++ b/pySim/global_platform.py @@ -95,8 +95,9 @@ # c0 04 02038010 # c0 04 03038010 class KeyInformationData(BER_TLV_IE, tag=0xc0): + KeyTypeLen = Struct('type'/KeyType, 'length'/Int8ub) _construct = Struct('key_identifier'/Byte, 'key_version_number'/Byte, - 'key_types'/GreedyRange(KeyType)) + 'key_types'/GreedyRange(KeyTypeLen)) class KeyInformation(BER_TLV_IE, tag=0xe0, nested=[KeyInformationData]): pass -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35448?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: Icf367827d62ed67afa27ee3d0ba9d5cd5bc65c99 Gerrit-Change-Number: 35448 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in pysim[master]: global_platform: Add support for key types of v2.3.1 (including AES)

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35450?usp=email ) Change subject: global_platform: Add support for key types of v2.3.1 (including AES) ...................................................................... global_platform: Add support for key types of v2.3.1 (including AES) Change-Id: Iae30f18435c2b0a349bfd9240b9c7cca06674534 --- M pySim/global_platform.py 1 file changed, 24 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/global_platform.py b/pySim/global_platform.py index 8daf927..2ed6ee4 100644 --- a/pySim/global_platform.py +++ b/pySim/global_platform.py @@ -1,7 +1,7 @@ # coding=utf-8 """Partial Support for GlobalPLatform Card Spec (currently 2.1.1) -(C) 2022 by Harald Welte <laforge(a)osmocom.org> +(C) 2022-2023 by Harald Welte <laforge(a)osmocom.org> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -68,6 +68,10 @@ # GlobalPlatform 2.1.1 Section 9.1.6 KeyType = Enum(Byte, des=0x80, + tls_psk=0x85, # v2.3.1 Section 11.1.8 + aes=0x88, # v2.3.1 Section 11.1.8 + hmac_sha1=0x90, # v2.3.1 Section 11.1.8 + hmac_sha1_160=0x91, # v2.3.1 Section 11.1.8 rsa_public_exponent_e_cleartex=0xA0, rsa_modulus_n_cleartext=0xA1, rsa_modulus_n=0xA2, @@ -77,6 +81,15 @@ rsa_chines_remainder_pq=0xA6, rsa_chines_remainder_dpi=0xA7, rsa_chines_remainder_dqi=0xA8, + ecc_public_key=0xB0, # v2.3.1 Section 11.1.8 + ecc_private_key=0xB1, # v2.3.1 Section 11.1.8 + ecc_field_parameter_p=0xB2, # v2.3.1 Section 11.1.8 + ecc_field_parameter_a=0xB3, # v2.3.1 Section 11.1.8 + ecc_field_parameter_b=0xB4, # v2.3.1 Section 11.1.8 + ecc_field_parameter_g=0xB5, # v2.3.1 Section 11.1.8 + ecc_field_parameter_n=0xB6, # v2.3.1 Section 11.1.8 + ecc_field_parameter_k=0xB7, # v2.3.1 Section 11.1.8 + ecc_key_parameters_reference=0xF0, # v2.3.1 Section 11.1.8 not_available=0xff) # GlobalPlatform 2.1.1 Section 9.3.3.1 @@ -93,6 +106,7 @@ ( 'c00403038010', {"key_identifier": 3, "key_version_number": 3, "key_types": [ {"length": 16, "type": "des"} ]} ), ( 'c00401038010', {"key_identifier": 1, "key_version_number": 3, "key_types": [ {"length": 16, "type": "des"} ]} ), ( 'c00402038010', {"key_identifier": 2, "key_version_number": 3, "key_types": [ {"length": 16, "type": "des"} ]} ), + ( 'c00402038810', {"key_identifier": 2, "key_version_number": 3, "key_types": [ {"length": 16, "type": "aes"} ]} ), ] KeyTypeLen = Struct('type'/KeyType, 'length'/Int8ub) _construct = Struct('key_identifier'/Byte, 'key_version_number'/Byte, -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35450?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: Iae30f18435c2b0a349bfd9240b9c7cca06674534 Gerrit-Change-Number: 35450 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in pysim[master]: global_platform: Add support for key types of v2.3.1 (including AES)

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35450?usp=email ) Change subject: global_platform: Add support for key types of v2.3.1 (including AES) ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35450?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: Iae30f18435c2b0a349bfd9240b9c7cca06674534 Gerrit-Change-Number: 35450 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 27 Dec 2023 15:40:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in pysim[master]: global_platform: Add TLV test data for Key Information Data

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35449?usp=email ) Change subject: global_platform: Add TLV test data for Key Information Data ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35449?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: Ib7b73cb28abea98986a66264a0779263873d7fb2 Gerrit-Change-Number: 35449 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 27 Dec 2023 15:40:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in pysim[master]: global_platform: Correctly decode Key Information Data

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35448?usp=email ) Change subject: global_platform: Correctly decode Key Information Data ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35448?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: Icf367827d62ed67afa27ee3d0ba9d5cd5bc65c99 Gerrit-Change-Number: 35448 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 27 Dec 2023 15:40:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in pysim[master]: Add TLV decoder test data

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35442?usp=email ) Change subject: Add TLV decoder test data ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35442?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: Ief156b7e466a772c78fb632b2fa00cba2eb1eba5 Gerrit-Change-Number: 35442 Gerrit-PatchSet: 3 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-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Dec 2023 15:40:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in pysim[master]: tlv: Fix from_dict() symmetry

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35447?usp=email ) Change subject: tlv: Fix from_dict() symmetry ...................................................................... tlv: Fix from_dict() symmetry the to_dict() method generates a {class_name: value} dictionary, for both the nested and non-nested case. However, before this patch, the from_dict() method expects a plain list of child IE dicts in the nested case. This is illogical. Let's make sure from_dict always expectes a {class_name: value} dict for both nested and non-nested situations. Change-Id: I07e4feb3800b420d8be7aae8911f828f1da9dab8 --- M pySim/tlv.py 1 file changed, 21 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/tlv.py b/pySim/tlv.py index 6ea7dd1..4ac5ebf 100644 --- a/pySim/tlv.py +++ b/pySim/tlv.py @@ -157,13 +157,13 @@ def from_dict(self, decoded: dict): """Set the IE internal decoded representation to data from the argument. If this is a nested IE, the child IE instance list is re-created.""" + expected_key_name = camel_to_snake(type(self).__name__) + if not expected_key_name in decoded: + raise ValueError("Dict %s doesn't contain expected key %s" % (decoded, expected_key_name)) if self.nested_collection: - self.children = self.nested_collection.from_dict(decoded) + self.children = self.nested_collection.from_dict(decoded[expected_key_name]) else: self.children = [] - expected_key_name = camel_to_snake(type(self).__name__) - if not expected_key_name in decoded: - raise ValueError("Dict %s doesn't contain expected key %s" % (decoded, expected_key_name)) self.decoded = decoded[expected_key_name] def is_constructed(self): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35447?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: I07e4feb3800b420d8be7aae8911f828f1da9dab8 Gerrit-Change-Number: 35447 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2023