- gerrit-log - lists.osmocom.org

[M] Change in pysim[master]: pySim-shell: rework startup procedure and introduce headless mode
by laforge 27 Aug '24

27 Aug '24

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/37932?usp=email ) Change subject: pySim-shell: rework startup procedure and introduce headless mode ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: I would prefer something like --nointeractive or --noprompt over --headless, but I guess those are small details. What do you think? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37932?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I07ecb27b37e2573629981a0d032cc95cd156be7e Gerrit-Change-Number: 37932 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Aug 2024 14:22:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[XS] Change in pysim[master]: scp: fix key length in dek_encrypt and dek_decrypt
by laforge 27 Aug '24

27 Aug '24

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/37931?usp=email ) Change subject: scp: fix key length in dek_encrypt and dek_decrypt ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/pysim/+/37931/comment/8c4baa08_496bc272?usp=em… : PS1, Line 9: When creating the DES cipher object with DES.new, we use the property : card_keys.dek. This property may hold a 16 byte key, but DES uses : an 8 byte key. Pycryptodome does not automatically ignore excess key : bytes. Instead it throws an exception. This means we need to make sure : to supply only the first 8 bytes of card_keys.dek did you check the spec and determie that this truncation is required/intended? IF yes, it would be great to add a comment with the spec reference to the code [optionally also the commit log]. Thanks. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37931?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I92e0dc6a6196b532bd8b53fca7b9e78070d6903f Gerrit-Change-Number: 37931 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Aug 2024 14:20:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[XS] Change in pysim[master]: global_platform: use scp_key_identity ICCID for ADF.ISD
by laforge 27 Aug '24

27 Aug '24

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/37919?usp=email ) Change subject: global_platform: use scp_key_identity ICCID for ADF.ISD ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37919?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I73a6f7088321a2b703074aa5228910709050cab2 Gerrit-Change-Number: 37919 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Aug 2024 14:19:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in pysim[master]: global_platform: use scp_key_identity ICCID for ADF.ISD
by laforge 27 Aug '24

27 Aug '24

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/37919?usp=email ) Change subject: global_platform: use scp_key_identity ICCID for ADF.ISD ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37919?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I73a6f7088321a2b703074aa5228910709050cab2 Gerrit-Change-Number: 37919 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Aug 2024 14:19:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in pysim[master]: global_platform: fix help description for establish_scp03
by laforge 27 Aug '24

27 Aug '24

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/37918?usp=email ) Change subject: global_platform: fix help description for establish_scp03 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37918?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ibb26bddf88b2e644a7f0c6b2a06bde228aa8afc7 Gerrit-Change-Number: 37918 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Aug 2024 14:18:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in pysim[master]: ara_m: use class byte of current lchan
by laforge 27 Aug '24

27 Aug '24

Attention is currently required from: dexter, fixeria. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/37840?usp=email ) Change subject: ara_m: use class byte of current lchan ...................................................................... Patch Set 8: Code-Review-1 (1 comment) Patchset: PS6: > Ok, I was mistaken (was recalling this from memory). MANAGE CHANNEL is not affected. […] I saw there's v8 of the patch, but it doesn't address this. If I look at one example (pySim/commands.py: terminal_profile), then it uses send_apdu_checksw which currently forces CLA to 0x80. With your patch applied, apply_lchan would be implicitly true and hence cause a bug. That's why I wrote we need to make sure all commands that do not work over logical channels need to be changed to include that explicit apply_lchan=False -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37840?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie3e48678f178a488bfaea6cc2b9a3e18145a8d10 Gerrit-Change-Number: 37840 Gerrit-PatchSet: 8 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> 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-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Aug 2024 14:18:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: filesystem: add command to delete all contents from a BER-TLV EF
by laforge 27 Aug '24

27 Aug '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/37917?usp=email ) Change subject: filesystem: add command to delete all contents from a BER-TLV EF ...................................................................... filesystem: add command to delete all contents from a BER-TLV EF When working with BER-TLF files, we can only delete one tag at a time. There is no way to delete all tags at once. This may make working with BER-TLV files difficult, in particular when scripting is used and the script needs to start with an empty file. Also export has problems, since it does not reset the file before setting the new values there may be unexpected results in case there still tags in the file that are not set during import. To fill the gap, let's add a commandd that deletes all tags in a BER-TLV EF at once. Related: OS#6531 Change-Id: I5d6bcfe865df7cb8fa6dd0052cab3b364d929f94 --- M pySim/filesystem.py 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 35af140..d5e99a4 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -1338,6 +1338,12 @@ if data: self._cmd.poutput(data) + def do_delete_all(self, opts): + """Delete all data from a BER-TLV EF""" + tags = self._cmd.lchan.retrieve_tags() + for tag in tags: + self._cmd.lchan.set_data(tag, None) + def __init__(self, fid: str, sfid: str = None, name: str = None, desc: str = None, parent: CardDF = None, size: Size = (1, None), **kwargs): """ @@ -1374,6 +1380,7 @@ if tags == []: export_str += "# empty file, no tags" else: + export_str += "delete_all\n" for t in tags: result = lchan.retrieve_data(t) (tag, l, val, remainer) = bertlv_parse_one(h2b(result[0])) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37917?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5d6bcfe865df7cb8fa6dd0052cab3b364d929f94 Gerrit-Change-Number: 37917 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[S] Change in pysim[master]: pySim-shell, cosmetic: define positional arguments last
by laforge 27 Aug '24

27 Aug '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/37895?usp=email ) Change subject: pySim-shell, cosmetic: define positional arguments last ...................................................................... pySim-shell, cosmetic: define positional arguments last When we define command arguments using the ArgumentParser, we sometimes define the positional arguments first. However, since positional arguments usually follow after the optional (--xyz) arguments, we should define the positional arguments last. Related: OS#6531 Change-Id: I2412eb6e7dc32ae95a575f31d4489ce210d85ea0 --- M pySim-shell.py M pySim/euicc.py M pySim/filesystem.py M pySim/ts_102_222.py 4 files changed, 14 insertions(+), 14 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim-shell.py b/pySim-shell.py index d166008..cc36485 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -236,9 +236,9 @@ self.equip(card, rs) apdu_cmd_parser = argparse.ArgumentParser() - apdu_cmd_parser.add_argument('APDU', type=is_hexstr, help='APDU as hex string') apdu_cmd_parser.add_argument('--expect-sw', help='expect a specified status word', type=str, default=None) apdu_cmd_parser.add_argument('--raw', help='Bypass the logical channel (and secure channel)', action='store_true') + apdu_cmd_parser.add_argument('APDU', type=is_hexstr, help='APDU as hex string') @cmd2.with_argparser(apdu_cmd_parser) def do_apdu(self, opts): @@ -770,13 +770,13 @@ self._cmd.poutput("no description available") verify_adm_parser = argparse.ArgumentParser() - verify_adm_parser.add_argument('ADM', nargs='?', type=is_hexstr_or_decimal, - help='ADM pin value. If none given, CSV file will be queried') verify_adm_parser.add_argument('--pin-is-hex', action='store_true', help='ADM pin value is specified as hex-string (not decimal)') verify_adm_parser.add_argument('--adm-type', choices=[x for x in pin_names.values() if x.startswith('ADM')], help='Override ADM number. Default is card-model-specific, usually 1') + verify_adm_parser.add_argument('ADM', nargs='?', type=is_hexstr_or_decimal, + help='ADM pin value. If none given, CSV file will be queried') @cmd2.with_argparser(verify_adm_parser) def do_verify_adm(self, opts): diff --git a/pySim/euicc.py b/pySim/euicc.py index ddfe939..d0cb682 100644 --- a/pySim/euicc.py +++ b/pySim/euicc.py @@ -503,8 +503,8 @@ self._cmd.poutput_json(flatten_dict_lists(d['get_euicc_data'])) set_nickname_parser = argparse.ArgumentParser() - set_nickname_parser.add_argument('ICCID', help='ICCID of the profile whose nickname to set') set_nickname_parser.add_argument('--profile-nickname', help='Nickname of the profile') + set_nickname_parser.add_argument('ICCID', help='ICCID of the profile whose nickname to set') @cmd2.with_argparser(set_nickname_parser) def do_set_nickname(self, opts): diff --git a/pySim/filesystem.py b/pySim/filesystem.py index d5e99a4..b166bc2 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -636,9 +636,9 @@ self._cmd.poutput(data) upd_bin_dec_parser = argparse.ArgumentParser() - upd_bin_dec_parser.add_argument('data', help='Abstract data (JSON format) to write') upd_bin_dec_parser.add_argument('--json-path', type=str, help='JSON path to modify specific element of file only') + upd_bin_dec_parser.add_argument('data', help='Abstract data (JSON format) to write') @cmd2.with_argparser(upd_bin_dec_parser) def do_update_binary_decoded(self, opts): @@ -839,9 +839,9 @@ read_rec_parser = argparse.ArgumentParser() read_rec_parser.add_argument( - 'record_nr', type=auto_uint8, help='Number of record to be read') - read_rec_parser.add_argument( '--count', type=auto_uint8, default=1, help='Number of records to be read, beginning at record_nr') + read_rec_parser.add_argument( + 'record_nr', type=auto_uint8, help='Number of record to be read') @cmd2.with_argparser(read_rec_parser) def do_read_record(self, opts): @@ -856,10 +856,10 @@ self._cmd.poutput("%03d %s" % (recnr, recstr)) read_rec_dec_parser = argparse.ArgumentParser() - read_rec_dec_parser.add_argument( - 'record_nr', type=auto_uint8, help='Number of record to be read') read_rec_dec_parser.add_argument('--oneline', action='store_true', help='No JSON pretty-printing, dump as a single line') + read_rec_dec_parser.add_argument( + 'record_nr', type=auto_uint8, help='Number of record to be read') @cmd2.with_argparser(read_rec_dec_parser) def do_read_record_decoded(self, opts): @@ -909,11 +909,11 @@ self._cmd.poutput(data) upd_rec_dec_parser = argparse.ArgumentParser() + upd_rec_dec_parser.add_argument('--json-path', type=str, + help='JSON path to modify specific element of record only') upd_rec_dec_parser.add_argument( 'record_nr', type=auto_uint8, help='Number of record to be read') upd_rec_dec_parser.add_argument('data', help='Abstract data (JSON format) to write') - upd_rec_dec_parser.add_argument('--json-path', type=str, - help='JSON path to modify specific element of record only') @cmd2.with_argparser(upd_rec_dec_parser) def do_update_record_decoded(self, opts): diff --git a/pySim/ts_102_222.py b/pySim/ts_102_222.py index 7c47fd5..30254d1 100644 --- a/pySim/ts_102_222.py +++ b/pySim/ts_102_222.py @@ -103,7 +103,6 @@ (_data, _sw) = self._cmd.lchan.scc.terminate_card_usage() create_parser = argparse.ArgumentParser() - create_parser.add_argument('FILE_ID', type=is_hexstr, help='File Identifier as 4-character hex string') create_parser._action_groups.pop() create_required = create_parser.add_argument_group('required arguments') create_optional = create_parser.add_argument_group('optional arguments') @@ -115,6 +114,7 @@ create_optional.add_argument('--short-file-id', type=str, help='Short File Identifier as 2-digit hex string') create_optional.add_argument('--shareable', action='store_true', help='Should the file be shareable?') create_optional.add_argument('--record-length', type=auto_uint16, help='Length of each record in octets') + create_parser.add_argument('FILE_ID', type=is_hexstr, help='File Identifier as 4-character hex string') @cmd2.with_argparser(create_parser) def do_create_ef(self, opts): @@ -150,7 +150,6 @@ self._cmd.lchan.select_file(self._cmd.lchan.selected_file) createdf_parser = argparse.ArgumentParser() - createdf_parser.add_argument('FILE_ID', type=is_hexstr, help='File Identifier as 4-character hex string') createdf_parser._action_groups.pop() createdf_required = createdf_parser.add_argument_group('required arguments') createdf_optional = createdf_parser.add_argument_group('optional arguments') @@ -165,6 +164,7 @@ createdf_sja_optional.add_argument('--permit-rfm-delete-terminate', action='store_true') createdf_sja_optional.add_argument('--permit-other-applet-create', action='store_true') createdf_sja_optional.add_argument('--permit-other-applet-delete-terminate', action='store_true') + createdf_parser.add_argument('FILE_ID', type=is_hexstr, help='File Identifier as 4-character hex string') @cmd2.with_argparser(createdf_parser) def do_create_df(self, opts): @@ -201,10 +201,10 @@ self._cmd.lchan.select_file(self._cmd.lchan.selected_file) resize_ef_parser = argparse.ArgumentParser() - resize_ef_parser.add_argument('NAME', type=str, help='Name or FID of file to be resized') resize_ef_parser._action_groups.pop() resize_ef_required = resize_ef_parser.add_argument_group('required arguments') resize_ef_required.add_argument('--file-size', required=True, type=auto_uint16, help='Size of file in octets') + resize_ef_parser.add_argument('NAME', type=str, help='Name or FID of file to be resized') @cmd2.with_argparser(resize_ef_parser) def do_resize_ef(self, opts): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37895?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2412eb6e7dc32ae95a575f31d4489ce210d85ea0 Gerrit-Change-Number: 37895 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in pysim[master]: pySim-shell: prevent opening/closing logical channel 0
by laforge 27 Aug '24

27 Aug '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/37839?usp=email ) Change subject: pySim-shell: prevent opening/closing logical channel 0 ...................................................................... pySim-shell: prevent opening/closing logical channel 0 The basic logical channel 0 is always present. It cannot be created or closed. Let's restrict the value range of chan_nr, so that only valid lchan numbers can be passed. Related: OS#6531 Change-Id: I4eebd9f15fadd18e1caeb033fda36c59446fcab8 --- M pySim-shell.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim-shell.py b/pySim-shell.py index cc36485..0ba8a25 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -965,7 +965,7 @@ open_chan_parser = argparse.ArgumentParser() open_chan_parser.add_argument( - 'chan_nr', type=int, default=0, help='Channel Number') + 'chan_nr', type=int, default=1, choices=range(1,16), help='Channel Number') @cmd2.with_argparser(open_chan_parser) def do_open_channel(self, opts): @@ -977,7 +977,7 @@ close_chan_parser = argparse.ArgumentParser() close_chan_parser.add_argument( - 'chan_nr', type=int, default=0, help='Channel Number') + 'chan_nr', type=int, default=1, choices=range(1,16), help='Channel Number') @cmd2.with_argparser(close_chan_parser) def do_close_channel(self, opts): @@ -989,7 +989,7 @@ switch_chan_parser = argparse.ArgumentParser() switch_chan_parser.add_argument( - 'chan_nr', type=int, default=0, help='Channel Number') + 'chan_nr', type=int, default=0, choices=range(0,16), help='Channel Number') @cmd2.with_argparser(switch_chan_parser) def do_switch_channel(self, opts): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37839?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4eebd9f15fadd18e1caeb033fda36c59446fcab8 Gerrit-Change-Number: 37839 Gerrit-PatchSet: 7 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: pySim-shell: prevent opening/closing logical channel 0
by laforge 27 Aug '24

27 Aug '24

Attention is currently required from: dexter, fixeria. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/37839?usp=email ) Change subject: pySim-shell: prevent opening/closing logical channel 0 ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37839?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4eebd9f15fadd18e1caeb033fda36c59446fcab8 Gerrit-Change-Number: 37839 Gerrit-PatchSet: 7 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Aug 2024 14:15:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log