- gerrit-log - lists.osmocom.org

[M] Change in pysim[master]: ts_31_102: Start to use construct for EF.SUCI_Calc_Info
by laforge 04 Jan '24

04 Jan '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35427?usp=email ) Change subject: ts_31_102: Start to use construct for EF.SUCI_Calc_Info ...................................................................... ts_31_102: Start to use construct for EF.SUCI_Calc_Info We cannot fully switch to construct for all of it easily due to the priority value and the ordering/sorting by priority implemented in the hand-coded version. But we can at least migrate the encode/decode of the hnet_pubkey_list via construct. Change-Id: I4ad5ea57bab37c2dc218e7752d538aa4cdc36ee3 --- M pySim/ts_31_102.py M tests/test_utils.py 2 files changed, 44 insertions(+), 62 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index fdd8acf..4134650 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -286,17 +286,14 @@ _construct = GreedyRange( Struct('identifier'/Enum(Byte, null=0, A=1, B=2), 'key_index'/Int8ub)) - class HnetPubkeyIdentifier(BER_TLV_IE, tag=0x80): # 3GPP TS 24.501 / 3GPP TS 23.003 _construct = Int8ub - class HnetPubkey(BER_TLV_IE, tag=0x81): - # FIXME: RFC 5480 + # contents according to RFC 7748 / RFC 5480 _construct = HexAdapter(GreedyBytes) - class HnetPubkeyList(BER_TLV_IE, tag=0xa1, nested=[HnetPubkeyIdentifier, HnetPubkey]): pass @@ -319,30 +316,35 @@ return out_bytes - def _encode_hnet_pubkey_list(self, hnet_pubkey_list): - out_bytes = [0xa1] # pubkey list tag - out_bytes.append(0x00) # length filled later - length = 0 + @staticmethod + def _compact_pubkey_list(l: List[dict]) -> List[dict]: + """conversion method to generate list of {hnet_pubkey_identifier, hnet_pubkey} dicts + from flat [{hnet_pubkey_identifier: }, {net_pubkey: }, ...] list""" + out = [] + while len(l): + a = l.pop(0) + b = l.pop(0) + z = {**a, **b} + out.append(z) + return out - for key in hnet_pubkey_list: - out_bytes.append(0x80) # identifier tag - out_bytes.append(0x01) # TODO size, fixed to 1 byte - out_bytes.append(key["hnet_pubkey_identifier"]) - out_bytes.append(0x81) # key tag - out_bytes.append(len(key["hnet_pubkey"])//2) - length += 5+len(key["hnet_pubkey"])//2 - - pubkey_bytes = h2b(key["hnet_pubkey"]) - out_bytes += pubkey_bytes - - # fill length - out_bytes[1] = length - return out_bytes + @staticmethod + def _expand_pubkey_list(l: List[dict]) -> List[dict]: + """conversion method to generate flat [{hnet_pubkey_identifier: }, {net_pubkey: }, ...] list + from compacted list of {hnet_pubkey_identifier, hnet_pubkey} dicts""" + out = [] + for d in l: + for k, v in d.items(): + out.append({k: v}) + return out def _encode_hex(self, in_json): out_bytes = self._encode_prot_scheme_id_list( in_json['prot_scheme_id_list']) - out_bytes += self._encode_hnet_pubkey_list(in_json['hnet_pubkey_list']) + d = self._expand_pubkey_list(in_json['hnet_pubkey_list']) + hpkl = EF_SUCI_Calc_Info.HnetPubkeyList() + hpkl.from_dict({'hnet_pubkey_list': d}) + out_bytes += hpkl.to_tlv() return "".join(["%02X" % i for i in out_bytes]) def _decode_prot_scheme_id_list(self, in_bytes): @@ -359,42 +361,6 @@ prot_scheme_id_list.append(prot_scheme) return prot_scheme_id_list - def _decode_hnet_pubkey_list(self, in_bytes): - hnet_pubkey_list = [] - pos = 0 - if in_bytes[pos] != 0xa1: - print("missing Home Network Public Key List data object") - return {} - pos += 1 - hnet_pubkey_list_len = in_bytes[pos] - pos += 1 - - while pos < hnet_pubkey_list_len: - if in_bytes[pos] != 0x80: - print("missing Home Network Public Key Identifier tag") - return {} - pos += 1 - # TODO might be more than 1 byte? - hnet_pubkey_id_len = in_bytes[pos] - pos += 1 - hnet_pubkey_id = in_bytes[pos:pos+hnet_pubkey_id_len][0] - pos += hnet_pubkey_id_len - if in_bytes[pos] != 0x81: - print("missing Home Network Public Key tag") - return {} - pos += 1 - hnet_pubkey_len = in_bytes[pos] - pos += 1 - hnet_pubkey = in_bytes[pos:pos+hnet_pubkey_len] - pos += hnet_pubkey_len - - hnet_pubkey_list.append({ - 'hnet_pubkey_identifier': hnet_pubkey_id, - 'hnet_pubkey': b2h(hnet_pubkey) - }) - - return hnet_pubkey_list - def _decode_bin(self, in_bin): return self._decode_hex(b2h(in_bin)) @@ -415,7 +381,9 @@ pos += prot_scheme_id_list_len # remaining data holds Home Network Public Key Data Object - hnet_pubkey_list = self._decode_hnet_pubkey_list(in_bytes[pos:]) + hpkl = EF_SUCI_Calc_Info.HnetPubkeyList() + hpkl.from_tlv(in_bytes[pos:]) + hnet_pubkey_list = self._compact_pubkey_list(hpkl.to_dict()['hnet_pubkey_list']) return { 'prot_scheme_id_list': prot_scheme_id_list, diff --git a/tests/test_utils.py b/tests/test_utils.py index 062b614..ea1964b 100755 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -136,12 +136,12 @@ def testDecodeSuciCalcInfo(self): suci_calc_info = EF_SUCI_Calc_Info() - decoded = suci_calc_info._decode_hex(self.testfile_suci_calc_info) + decoded = suci_calc_info.decode_hex(self.testfile_suci_calc_info) self.assertDictEqual(self.decoded_testfile_suci, decoded) def testEncodeSuciCalcInfo(self): suci_calc_info = EF_SUCI_Calc_Info() - encoded = suci_calc_info._encode_hex(self.decoded_testfile_suci) + encoded = suci_calc_info.encode_hex(self.decoded_testfile_suci) self.assertEqual(encoded.lower(), self.testfile_suci_calc_info.lower()) def testEnc_msisdn(self): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35427?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: I4ad5ea57bab37c2dc218e7752d538aa4cdc36ee3 Gerrit-Change-Number: 35427 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-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: merlinchlosta <merlin.chlosta(a)rub.de> Gerrit-MessageType: merged

1 0

[S] Change in pysim[master]: ts_31_103: Add construct for EF.GBABP and EF.GBANL
by laforge 04 Jan '24

04 Jan '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35424?usp=email ) Change subject: ts_31_103: Add construct for EF.GBABP and EF.GBANL ...................................................................... ts_31_103: Add construct for EF.GBABP and EF.GBANL Change-Id: Ife06f54c2443f3e048bd36f706f309843703403a --- M pySim/ts_31_103.py M pysim-testdata/pySim-trace_test_gsmtap.pcapng.ok 2 files changed, 22 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py index df91ea1..e9275c5 100644 --- a/pySim/ts_31_103.py +++ b/pySim/ts_31_103.py @@ -156,11 +156,23 @@ class EF_GBABP(TransparentEF): def __init__(self, fid='6fd5', sfid=None, name='EF.GBABP', desc='GBA Bootstrapping', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._construct = Struct('rand'/LV, + 'b_tid'/LV, + 'key_lifetime'/LV) # TS 31.103 Section 4.2.10 class EF_GBANL(LinFixedEF): + class NAF_ID(BER_TLV_IE, tag=0x80): + _construct = Struct('fqdn'/Utf8Adapter(Bytes(this._.total_len-5)), + 'ua_spi'/HexAdapter(Bytes(5))) + class B_TID(BER_TLV_IE, tag=0x81): + _construct = Utf8Adapter(GreedyBytes) + # pylint: disable=undefined-variable + class GbaNlCollection(TLV_IE_Collection, nested=[NAF_ID, B_TID]): + pass def __init__(self, fid='6fd7', sfid=None, name='EF.GBANL', desc='GBA NAF List', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) + self._tlv = EF_GBANL.GbaNlCollection # TS 31.103 Section 4.2.11 class EF_NAFKCA(LinFixedEF): diff --git a/pysim-testdata/pySim-trace_test_gsmtap.pcapng.ok b/pysim-testdata/pySim-trace_test_gsmtap.pcapng.ok index 2d9d951..047f9de 100644 --- a/pysim-testdata/pySim-trace_test_gsmtap.pcapng.ok +++ b/pysim-testdata/pySim-trace_test_gsmtap.pcapng.ok @@ -347,7 +347,7 @@ =============================== 01 READ BINARY MF/ADF.ISIM/EF.IST - 9000 {1: {'activated': True, 'description': 'P-CSCF address'}, 2: {'activated': False, 'description': 'Generic Bootstrapping Architecture (GBA)'}, 3: {'activated': False, 'description': 'HTTP Digest'}, 4: {'activated': True, 'description': 'GBA-based Local Key Establishment Mechanism'}, 5: {'activated': True, 'description': 'Support of P-CSCF discovery for IMS Local Break Out'}, 6: {'activated': False, 'description': 'Short Message Storage (SMS)'}, 7: {'activated': False, 'description': 'Short Message Status Reports (SMSR)'}, 8: {'activated': False, 'description': 'Support for SM-over-IP including data download via SMS-PP as defined in TS 31.111 [31]'}, 9: {'activated': False, 'description': 'Communication Control for IMS by ISIM'}, 10: {'activated': True, 'description': 'Support of UICC access to IMS'}, 11: {'activated': False, 'description': 'URI support by UICC'}, 12: {'activated': False, 'description': 'Media Type support'}, 13: {'activated': False, 'description': 'IMS call disconnection cause'}, 14: {'activated': False, 'description': 'URI support for MO SHORT MESSAGE CONTROL'}, 15: {'activated': False, 'description': 'MCPTT'}, 16: {'activated': False, 'description': 'URI support for SMS-PP DOWNLOAD as defined in 3GPP TS 31.111 [31]'}, 17: {'activated': False, 'description': 'From Preferred'}, 18: {'activated': False, 'description': 'IMS configuration data'}, 19: {'activated': False, 'description': 'XCAP Configuration Data'}, 20: {'activated': False, 'description': 'WebRTC URI'}, 21: {'activated': False, 'description': 'MuD and MiD configuration data'}, 22: {'activated': False}, 23: {'activated': False}, 24: {'activated': False}} =============================== -01 READ BINARY MF/ADF.ISIM/EF.GBABP - 9000 {'raw': 'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff'} +01 READ BINARY MF/ADF.ISIM/EF.GBABP - 9000 None =============================== 01 READ RECORD MF/ADF.ISIM/EF.IMPU 02 9000 {'impu': None} =============================== -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35424?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: Ife06f54c2443f3e048bd36f706f309843703403a Gerrit-Change-Number: 35424 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in pysim[master]: ts_31_103: Add TLV + construct for EF_NAFKCA
by laforge 04 Jan '24

04 Jan '24

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35425?usp=email ) Change subject: ts_31_103: Add TLV + construct for EF_NAFKCA ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35425?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: I124064994eb695790e9a3aff40be8139b3a2f2cf Gerrit-Change-Number: 35425 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 04 Jan 2024 20:43:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: ts_31_103: Add construct for EF.GBABP and EF.GBANL
by laforge 04 Jan '24

04 Jan '24

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35424?usp=email ) Change subject: ts_31_103: Add construct for EF.GBABP and EF.GBANL ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35424?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: Ife06f54c2443f3e048bd36f706f309843703403a Gerrit-Change-Number: 35424 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 04 Jan 2024 20:43:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: construct: avoid StreamError exceptions due to files containing all-ff
by laforge 04 Jan '24

04 Jan '24

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35487?usp=email ) Change subject: construct: avoid StreamError exceptions due to files containing all-ff ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35487?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: I09c3cb82063fc094eb047749996a6eceff757ea2 Gerrit-Change-Number: 35487 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 04 Jan 2024 20:43:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: ts_31_103: Add construct for EF.GBABP and EF.GBANL
by laforge 04 Jan '24

04 Jan '24

Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/35424?usp=email to look at the new patch set (#7). Change subject: ts_31_103: Add construct for EF.GBABP and EF.GBANL ...................................................................... ts_31_103: Add construct for EF.GBABP and EF.GBANL Change-Id: Ife06f54c2443f3e048bd36f706f309843703403a --- M pySim/ts_31_103.py M pysim-testdata/pySim-trace_test_gsmtap.pcapng.ok 2 files changed, 22 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/24/35424/7 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35424?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: Ife06f54c2443f3e048bd36f706f309843703403a Gerrit-Change-Number: 35424 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in pysim[master]: ts_31_103: Add construct for EF.GBABP and EF.GBANL
by laforge 04 Jan '24

04 Jan '24

Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/35424?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Code-Review+2 by fixeria, Verified-1 by Jenkins Builder Change subject: ts_31_103: Add construct for EF.GBABP and EF.GBANL ...................................................................... ts_31_103: Add construct for EF.GBABP and EF.GBANL Change-Id: Ife06f54c2443f3e048bd36f706f309843703403a --- M pySim/ts_31_103.py 1 file changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/24/35424/6 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35424?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: Ife06f54c2443f3e048bd36f706f309843703403a Gerrit-Change-Number: 35424 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in pysim[master]: construct: avoid StreamError exceptions due to files containing all-ff
by laforge 04 Jan '24

04 Jan '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35487?usp=email ) Change subject: construct: avoid StreamError exceptions due to files containing all-ff ...................................................................... construct: avoid StreamError exceptions due to files containing all-ff In smart cards, files/records containing all-ff means they are simply not used/initialized. Let's avoid raising exceptions when interpreting 0xff as length value and reading less bytes as value. Change-Id: I09c3cb82063fc094eb047749996a6eceff757ea2 --- M pySim/construct.py 1 file changed, 23 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/87/35487/1 diff --git a/pySim/construct.py b/pySim/construct.py index 1ed3576..0c82c41 100644 --- a/pySim/construct.py +++ b/pySim/construct.py @@ -402,7 +402,16 @@ """Helper function to wrap around normalize_construct() and filter_dict().""" if not length: length = len(raw_bin_data) - parsed = c.parse(raw_bin_data, total_len=length, **context) + try: + parsed = c.parse(raw_bin_data, total_len=length, **context) + except StreamError as e: + # if the input is all-ff, this means the content is undefined. Let's avoid passing StreamError + # exceptions in those situations (which might occur if a length field 0xff is 255 but then there's + # actually less bytes in the remainder of the file. + if all([v == 0xff for v in raw_bin_data]): + return None + else: + raise e return normalize_construct(parsed) def build_construct(c, decoded_data, context: dict = {}): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35487?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: I09c3cb82063fc094eb047749996a6eceff757ea2 Gerrit-Change-Number: 35487 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[M] Change in pysim[master]: ts_31_102: Start to use construct for EF.SUCI_Calc_Info
by laforge 04 Jan '24

04 Jan '24

Attention is currently required from: dexter, fixeria, merlinchlosta. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35427?usp=email ) Change subject: ts_31_102: Start to use construct for EF.SUCI_Calc_Info ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35427?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: I4ad5ea57bab37c2dc218e7752d538aa4cdc36ee3 Gerrit-Change-Number: 35427 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-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: merlinchlosta <merlin.chlosta(a)rub.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: merlinchlosta <merlin.chlosta(a)rub.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 04 Jan 2024 19:39:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in pysim[master]: ts_102_310: Add file definitions resembling ETSI TS 102 310 (EAP)
by laforge 04 Jan '24

04 Jan '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35486?usp=email ) Change subject: ts_102_310: Add file definitions resembling ETSI TS 102 310 (EAP) ...................................................................... ts_102_310: Add file definitions resembling ETSI TS 102 310 (EAP) The definitions are not used yet, as one would have to add that dynamically based on which EF.DIR entries contain the 0x73 discretionary template. As I don't have any cards implementing this so far, I'll skip that part. Change-Id: I532ff2c94021ab1b4520fe2b6988c8960319d208 --- A pySim/ts_102_310.py 1 file changed, 128 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/86/35486/1 diff --git a/pySim/ts_102_310.py b/pySim/ts_102_310.py new file mode 100644 index 0000000..75b9206 --- /dev/null +++ b/pySim/ts_102_310.py @@ -0,0 +1,114 @@ +# coding=utf-8 +"""Utilities / Functions related to ETSI TS 102 310, the EAP UICC spec. + +(C) 2024 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 +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. +""" + +from pySim.construct import * +from construct import * +from construct import Optional as COptional + +#from pySim.utils import * +from pySim.filesystem import CardDF, TransparentEF +from pySim.tlv import BER_TLV_IE, TLV_IE_Collection + +# TS102 310 Section 7.1 +class EF_EAPKEYS(TransparentEF): + class Msk(BER_TLV_IE, tag=0x80): + _construct = HexAdapter(GreedyBytes) + class Emsk(BER_TLV_IE, tag=0x81): + _construct = HexAdapter(GreedyBytes) + class MskCollection(TLV_IE_Collection, nested=[Msk, Emsk]): + pass + + def __init__(self, fid='4f01', name='EF.EAPKEYS', desc='EAP derived keys'): + super().__init__(fid, sfid=0x01, name=name, desc=desc, size=(1,None)) + self._tlv = EF_EAPKEYS.MskCollection + +# TS 102 310 Section 7.2 +class EF_EAPSTATUS(TransparentEF): + def __init__(self, fid='4f02', name='EF.EAPSTATUS', desc='EAP Authentication Status'): + super().__init__(fid, sfid=0x02, name=name, desc=desc, size=(1,1)) + self._construct = Enum(Int8ub, no_auth_started=0, authenticating=1, + authenticated=2, held_auth_failure=3) + +# TS 102 310 Section 7.3 +class EF_PUId(TransparentEF): + def __init__(self, fid='4f03', name='EF.PUId', desc='Permanent User Identity'): + super().__init__(fid, sfid=0x03, name=name, desc=desc, size=(10,None)) + self._construct = GreedyBytes + +# TS 102 310 Section 7.4 +class EF_Ps(TransparentEF): + def __init__(self, fid='4f04', name='EF.Ps', desc='Pseudonym'): + super().__init__(fid, sfid=0x04, name=name, desc=desc, size=(1,None)) + self._construct = GreedyBytes + +# TS 102 310 Section 7.5 +class EF_CurID(TransparentEF): + def __init__(self, fid='4f20', name='EF.CurID', desc='Current Identity'): + super().__init__(fid, sfid=0x10, name=name, desc=desc, size=(1,None)) + self._construct = Struct('type'/Enum(Int8ub, permanent=0, pseudonym=1, re_authentication=2, should_not_be_revealed=255), + '_len'/Int8ub, + 'value'/Utf8Adapter(this._len)) + + +# TS 102 310 Section 7.6 +class EF_ReID(TransparentEF): + def Identity(BER_TLV_IE, tag=0x80): + _construct = Utf8Adapter(GreedyBytes) + def Counter(BER_TLV_IE, tag=0x81): + _construct = GreedyInteger + def Colleciton(TLV_IE_Collection, nested=[Identity,Counter]): + pass + + def __init__(self, fid='4f21', name='EF.ReID', desc='Re-Authentication Identity'): + super().__init__(fid, sfid=0x11, name=name, desc=desc, size=(1,None)) + self._tlv = EF_ReID.Collection + +# TS 102 310 Section 7.7 +class EF_ReID(TransparentEF): + def __init__(self, fid='4f22', name='EF.Realm', desc='Relm value of the identity'): + super().__init__(fid, sfid=0x12, name=name, desc=desc, size=(1,None)) + self._construct = Struct('_len'/Int8ub, + 'realm'/Utf8Adapter(Bytes(this._len))) + +class DF_EAP(CardDF): + # DF.EAP has no default FID; it always must be discovered via the EF.DIR entry + # and the 0x73 "discretionary template" + def __init__(self, fid, name='DF.EAP', desc='EAP client'): + super().__init__(fid=fid, name=name, desc=desc, **kwargs) + files = [ + EF_EAPKEYS(), + EF_EAPSTATUS(), + EF_PuID(), + EF_CurID(), + EF_ReID(), + ] + self.add_files(files) + + +# TS 102 310 Section 5.2 +class EapSupportedTypesList(BER_TLV_IE, tag=0x80): + _construct = GreedyRange(Int8ub) +class EapDedictedFilesList(BER_TLV_IE, tag=0x81): + _construct = GreedyRange(Int16ub) +class EapLabel(BER_TLV_IE, tag=0x82): + _construct = GreedyBytes +class EapAppSvcSpecData(BER_TLV_IE, 0xa0, nested=[EapSupportedTypesList, EapDedicatedFileList, EapLabel]): + pass +class DiscretionaryTemplate(BER_TLV_IE, 0x73, nested=[EapAppSvcSpecData]): + pass -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35486?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: I532ff2c94021ab1b4520fe2b6988c8960319d208 Gerrit-Change-Number: 35486 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log