February 2022 - gerrit-log - lists.osmocom.org

Change in pysim[master]: Add scripts/deacivate-5g.script

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27238 ) Change subject: Add scripts/deacivate-5g.script ...................................................................... Add scripts/deacivate-5g.script This script can be used to deactivate all 5G related services and files. Change-Id: I5dc3e9f0ae76a7ae57484e5a3369e11ff02c7eca --- A scripts/deactivate-5g.script 1 file changed, 69 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/scripts/deactivate-5g.script b/scripts/deactivate-5g.script new file mode 100644 index 0000000..13206fa --- /dev/null +++ b/scripts/deactivate-5g.script @@ -0,0 +1,69 @@ +# script to be used with pySim-shell.py which is part of the Osmocom pysim package, +# found at https://osmocom.org/projects/pysim/wiki +set echo true + +# this script will deactivate all 5G related services and files. This can be used +# in case you do not wish to use any 5G services, or you do not wish to configure +# the 5G specific files on the USIM card. The card will then behave like a 3G USIM +# without any 5G capability, using the default fall-back mechanisms specified by 3GPP. + +# TODO: add your card-specific ADM pin at the end of the verify_adm line below +verify_adm + +# deactivate any 5G related services in EF.UST +select ADF.USIM +select EF.UST +ust_service_deactivate 122 +ust_service_deactivate 123 +ust_service_deactivate 124 +ust_service_deactivate 125 +ust_service_deactivate 127 +ust_service_deactivate 129 +ust_service_deactivate 130 +ust_service_deactivate 132 +ust_service_deactivate 133 +ust_service_deactivate 134 +ust_service_deactivate 135 + +# deactivate all files in EF.5GS +select ADF.USIM +select DF.5GS + +select EF.5GAUTHKEYS +deactivate_file + +select EF.5GS3GPPLOCI +deactivate_file + +select EF.5GSN3GPPNSC +deactivate_file + +select EF.5GSN3GPPLOCI +deactivate_file + +select EF.5GS3GPPNSC +deactivate_file + +# only exists on sysmoISIM-SJA2v2 +select EF.OPL5G +deactivate_file + +select EF.Routing_Indicator +deactivate_file + +select EF.SUCI_Calc_Info +deactivate_file + +select EF.SUPI_NAI +deactivate_file + +# only exists on sysmoISIM-SJA2v2 +select EF.TN3GPPSNN +deactivate_file + +select EF.UAC_AIC +deactivate_file + +# only exists on sysmoISIM-SJA2v2 +select EF.URSP +deactivate_file -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5dc3e9f0ae76a7ae57484e5a3369e11ff02c7eca Gerrit-Change-Number: 27238 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in pysim[master]: shell: Proper argparser (for help + manual) activate_file

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27235 ) Change subject: shell: Proper argparser (for help + manual) activate_file ...................................................................... shell: Proper argparser (for help + manual) activate_file Change-Id: I5929ae3deff4d15b5db4a1d866576271c57a955f --- M docs/shell.rst M pySim-shell.py 2 files changed, 11 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/docs/shell.rst b/docs/shell.rst index 58588a2..fcc171b 100644 --- a/docs/shell.rst +++ b/docs/shell.rst @@ -143,7 +143,12 @@ activate_file ~~~~~~~~~~~~~ -Activate the currently selected file. This used to be called REHABILITATE in TS 11.11. +Activate the specified file. This used to be called REHABILITATE in TS 11.11. +You need to specify the name or FID of the file to activate. + +.. argparse:: + :module: pySim-shell + :func: Iso7816Commands.activate_file_parser open_channel ~~~~~~~~~~~~ diff --git a/pySim-shell.py b/pySim-shell.py index ad76ba0..ec417c7 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -805,13 +805,15 @@ self._cmd.poutput("CHV enable successful") def do_deactivate_file(self, opts): - """Deactivate the current EF""" + """Deactivate the currently selected EF""" (data, sw) = self._cmd.card._scc.deactivate_file() + activate_file_parser = argparse.ArgumentParser() + activate_file_parser.add_argument('NAME', type=str, help='File name or FID of file to activate') + @cmd2.with_argparser(activate_file_parser) def do_activate_file(self, opts): """Activate the specified EF""" - path = opts.arg_list[0] - (data, sw) = self._cmd.rs.activate_file(path) + (data, sw) = self._cmd.rs.activate_file(opts.NAME) def complete_activate_file(self, text, line, begidx, endidx) -> List[str]: """Command Line tab completion for ACTIVATE FILE""" -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5929ae3deff4d15b5db4a1d866576271c57a955f Gerrit-Change-Number: 27235 Gerrit-PatchSet: 1 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

3 years, 4 months

1
0
0 0

Change in pysim[master]: docs: Document missing 'status' command in 7816 section

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27236 ) Change subject: docs: Document missing 'status' command in 7816 section ...................................................................... docs: Document missing 'status' command in 7816 section Change-Id: I9af85a36bc4f24c3a22b9b2a6b8e2abd86edfe4e --- M docs/shell.rst 1 file changed, 35 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/docs/shell.rst b/docs/shell.rst index fcc171b..0f3139f 100644 --- a/docs/shell.rst +++ b/docs/shell.rst @@ -98,6 +98,41 @@ pySIM-shell (MF/ADF.USIM)> +status +~~~~~~ + +The ``status`` command [re-]obtains the File Control Template of the +currently-selected file and print its decoded output. + +Example: + +:: + + pySIM-shell (MF/ADF.ISIM)> status + { + "file_descriptor": { + "file_descriptor_byte": { + "shareable": true, + "file_type": "df", + "structure": "no_info_given" + }, + "record_len": null, + "num_of_rec": null + }, + "file_identifier": "ff01", + "df_name": "a0000000871004ffffffff8907090000", + "proprietary_information": { + "uicc_characteristics": "71", + "available_memory": 101640 + }, + "life_cycle_status_integer": "operational_activated", + "security_attrib_compact": "00", + "pin_status_template_do": { + "ps_do": "70", + "key_reference": 11 + } + } + change_chv ~~~~~~~~~~ -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9af85a36bc4f24c3a22b9b2a6b8e2abd86edfe4e Gerrit-Change-Number: 27236 Gerrit-PatchSet: 1 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

3 years, 4 months

1
0
0 0

Change in pysim[master]: doc: Improve documentation in various places

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27237 ) Change subject: doc: Improve documentation in various places ...................................................................... doc: Improve documentation in various places * don't duplicate information between .rst files and docstrings * if there's more than a trivial single-line documentation, put it as docstring into the python source and use ".. argparse" to pul it into the manual * add documentation for some commands for which it was missing * show one level deeper in the navigation table, listing the commands Change-Id: Ib88bb7d12faaac7d149ee1f6379bc128b83bbdd5 --- M docs/conf.py M docs/index.rst M docs/shell.rst M pySim-shell.py M pySim/ara_m.py M pySim/ts_31_102.py 6 files changed, 91 insertions(+), 28 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/docs/conf.py b/docs/conf.py index a96b87e..6fea583 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ # -- Project information ----------------------------------------------------- project = 'osmopysim-usermanual' -copyright = '2009-2021 by Sylvain Munaut, Harald Welte, Philipp Maier, Supreeth Herle' +copyright = '2009-2022 by Sylvain Munaut, Harald Welte, Philipp Maier, Supreeth Herle' author = 'Sylvain Munaut, Harald Welte, Philipp Maier, Supreeth Herle' diff --git a/docs/index.rst b/docs/index.rst index c647880..471802a 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -34,7 +34,7 @@ * the [legacy] :ref:`pySim-prog and pySim-read tools<Legacy tools>` .. toctree:: - :maxdepth: 2 + :maxdepth: 3 :caption: Contents: shell diff --git a/docs/shell.rst b/docs/shell.rst index 0f3139f..f24dc93 100644 --- a/docs/shell.rst +++ b/docs/shell.rst @@ -164,9 +164,6 @@ verify_chv ~~~~~~~~~~ -This command allows you to verify a CHV (PIN), which is how the specifications call -it if you authenticate yourself with the said CHV/PIN. - .. argparse:: :module: pySim-shell :func: Iso7816Commands.verify_chv_parser @@ -178,9 +175,6 @@ activate_file ~~~~~~~~~~~~~ -Activate the specified file. This used to be called REHABILITATE in TS 11.11. -You need to specify the name or FID of the file to activate. - .. argparse:: :module: pySim-shell :func: Iso7816Commands.activate_file_parser @@ -212,6 +206,7 @@ :func: Iso7816Commands.suspend_uicc_parser + pySim commands -------------- @@ -221,7 +216,6 @@ desc ~~~~ - Display human readable file description for the currently selected file. @@ -231,6 +225,17 @@ :module: pySim-shell :func: PySimCommands.dir_parser +Example: +:: + + pySIM-shell (MF)> dir + MF + 3f00 + .. ADF.USIM DF.SYSTEM EF.DIR EF.UMPC + ADF.ARA-M DF.EIRENE DF.TELECOM EF.ICCID MF + ADF.ISIM DF.GSM EF.ARR EF.PL + 14 files + export ~~~~~~ @@ -250,15 +255,27 @@ tree ~~~~ - Display a tree of the card filesystem. It is important to note that this displays a tree of files that might potentially exist (based on the card profile). In order to determine if a given file really exists on a given card, you have to try to select that file. +Example: +:: + + pySIM-shell (MF)> tree --help + EF.DIR 2f00 Application Directory + EF.ICCID 2fe2 ICC Identification + EF.PL 2f05 Preferred Languages + EF.ARR 2f06 Access Rule Reference + EF.UMPC 2f08 UICC Maximum Power Consumption + DF.TELECOM 7f10 None + EF.ADN 6f3a Abbreviated Dialing Numbers + ... + + verify_adm ~~~~~~~~~~ - Verify the ADM (Administrator) PIN specified as argument. This is typically needed in order to get write/update permissions to most of the files on SIM cards. @@ -286,8 +303,6 @@ :module: pySim-shell :func: PysimApp.bulk_script_parser -Run a script for bulk-provisioning of multiple cards. - echo ~~~~ @@ -296,6 +311,13 @@ :func: PysimApp.echo_parser +apdu +~~~~ +.. argparse:: + :module: pySim-shell + :func: PySimCommands.apdu_cmd_parser + + Linear Fixed EF commands ------------------------ @@ -484,6 +506,26 @@ :module: pySim.ts_31_102 :func: ADF_USIM.AddlShellCommands.authenticate_parser +terminal_profile +~~~~~~~~~~~~~~~~ +.. argparse:: + :module: pySim.ts_31_102 + :func: ADF_USIM.AddlShellCommands.term_prof_parser + +envelope +~~~~~~~~ +.. argparse:: + :module: pySim.ts_31_102 + :func: ADF_USIM.AddlShellCommands.envelope_parser + +envelope_sms +~~~~~~~~~~~~ +.. argparse:: + :module: pySim.ts_31_102 + :func: ADF_USIM.AddlShellCommands.envelope_sms_parser + + + ARA-M commands -------------- @@ -546,21 +588,14 @@ NOTE: Not supported in all ARA-M implementations. -.. argparse:: - :module: pySim.ara_m - :func: ADF_ARAM.AddlShellCommands.get_config_parser - aram_store_ref_ar_do ~~~~~~~~~~~~~~~~~~~~ -Store a [new] access rule on the ARA-M applet. - .. argparse:: :module: pySim.ara_m :func: ADF_ARAM.AddlShellCommands.store_ref_ar_do_parse For example, to store an Android UICC carrier privilege rule for the SHA1 hash of the certificate used to sign the CoIMS android app of Supreeth Herle (https://github.com/herlesupreeth/CoIMS_Wiki) you can use the following command: - :: pySIM-shell (MF/ADF.ARA-M)> aram_store_ref_ar_do --aid FFFFFFFFFFFF --device-app-id E46872F28B350B7E1F140DE535C2A8D5804F0BE3 --android-permissions 0000000000000001 --apdu-always diff --git a/pySim-shell.py b/pySim-shell.py index ec417c7..0753b10 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -683,7 +683,8 @@ def do_apdu(self, opts): """Send a raw APDU to the card, and print SW + Response. DANGEROUS: pySim-shell will not know any card state changes, and - not continue to work as expected if you e.g. select a different file.""" + not continue to work as expected if you e.g. select a different + file.""" data, sw = self._cmd.card._scc._tp.send_apdu(opts.APDU) self._cmd.poutput("SW: %s %s, RESP: %s" % (sw, self._cmd.rs.interpret_sw(sw), data)) @@ -739,7 +740,9 @@ @cmd2.with_argparser(verify_chv_parser) def do_verify_chv(self, opts): - """Verify (authenticate) using specified PIN code""" + """Verify (authenticate) using specified CHV (PIN) code, which is how the specifications + call it if you authenticate yourself using the specified PIN. There usually is at least PIN1 and + PIN2.""" pin = self.get_code(opts.pin_code) (data, sw) = self._cmd.card._scc.verify_chv(opts.pin_nr, h2b(pin)) self._cmd.poutput("CHV verification successful") @@ -812,7 +815,8 @@ activate_file_parser.add_argument('NAME', type=str, help='File name or FID of file to activate') @cmd2.with_argparser(activate_file_parser) def do_activate_file(self, opts): - """Activate the specified EF""" + """Activate the specified EF. This used to be called REHABILITATE in TS 11.11 for classic + SIM. You need to specify the name or FID of the file to activate.""" (data, sw) = self._cmd.rs.activate_file(opts.NAME) def complete_activate_file(self, text, line, begidx, endidx) -> List[str]: diff --git a/pySim/ara_m.py b/pySim/ara_m.py index 0928f8d..59f205c 100644 --- a/pySim/ara_m.py +++ b/pySim/ara_m.py @@ -311,7 +311,7 @@ self._cmd.poutput_json(res_do.to_dict()) def do_aram_get_config(self, opts): - """GET DATA [Config] on the ARA-M Applet""" + """Perform GET DATA [Config] on the ARA-M Applet: Tell it our version and retrieve its version.""" res_do = ADF_ARAM.get_config(self._cmd.card._scc._tp) if res_do: self._cmd.poutput_json(res_do.to_dict()) @@ -345,7 +345,7 @@ @cmd2.with_argparser(store_ref_ar_do_parse) def do_aram_store_ref_ar_do(self, opts): - """Perform STORE DATA [Command-Store-REF-AR-DO] to store a new access rule.""" + """Perform STORE DATA [Command-Store-REF-AR-DO] to store a (new) access rule.""" # REF ref_do_content = [] if opts.aid: diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 3995dfa..c6bfa2d 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -1310,18 +1310,42 @@ (data, sw) = self._cmd.card._scc.authenticate(opts.rand, opts.autn) self._cmd.poutput_json(data) + term_prof_parser = argparse.ArgumentParser() + term_prof_parser.add_argument('PROFILE', help='Hexstring of encoded terminal profile') + + @cmd2.with_argparser(term_prof_parser) def do_terminal_profile(self, arg): - """Send a TERMINAL PROFILE command to the card.""" + """Send a TERMINAL PROFILE command to the card. + This is used to inform the card about which optional + features the terminal (modem/phone) supports, particularly + in the context of SIM Toolkit, Proactive SIM and OTA. You + must specify a hex-string with the encoded terminal profile + you want to send to the card.""" (data, sw) = self._cmd.card._scc.terminal_profile(arg) self._cmd.poutput('SW: %s, data: %s' % (sw, data)) + envelope_parser = argparse.ArgumentParser() + envelope_parser.add_argument('PAYLOAD', help='Hexstring of encoded payload to ENVELOPE') + + @cmd2.with_argparser(envelope_parser) def do_envelope(self, arg): - """Send an ENVELOPE command to the card.""" + """Send an ENVELOPE command to the card. This is how a + variety of information is communicated from the terminal + (modem/phone) to the card, particularly in the context of + SIM Toolkit, Proactive SIM and OTA.""" (data, sw) = self._cmd.card._scc.envelope(arg) self._cmd.poutput('SW: %s, data: %s' % (sw, data)) + envelope_sms_parser = argparse.ArgumentParser() + envelope_sms_parser.add_argument('TPDU', help='Hexstring of encoded SMS TPDU') + + @cmd2.with_argparser(envelope_sms_parser) def do_envelope_sms(self, arg): - """Send an ENVELOPE command to the card.""" + """Send an ENVELOPE(SMS-PP-Download) command to the card. + This emulates a terminal (modem/phone) having received a SMS + with a PID of 'SMS for the SIM card'. You can use this + command in the context of testing OTA related features + without a modem/phone or a cellular netwokr.""" tpdu_ie = SMS_TPDU() tpdu_ie.from_bytes(h2b(arg)) dev_ids = DeviceIdentities( -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib88bb7d12faaac7d149ee1f6379bc128b83bbdd5 Gerrit-Change-Number: 27237 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in pysim[master]: docs/legcay.txt: Point to pySim-shell as replacement

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27208 ) Change subject: docs/legcay.txt: Point to pySim-shell as replacement ...................................................................... docs/legcay.txt: Point to pySim-shell as replacement Change-Id: I9ca6b9d8c35e23be2ec8752107bb7d1e4f6f9bc1 --- M docs/legacy.rst 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/docs/legacy.rst b/docs/legacy.rst index ec3ddfc..d93358f 100644 --- a/docs/legacy.rst +++ b/docs/legacy.rst @@ -4,6 +4,9 @@ *legacy tools* are the classic ``pySim-prog`` and ``pySim-read`` programs that existed long before ``pySim-shell``. +These days, you should primarily use ``pySim-shell`` instead of these +legacy tools. + pySim-prog ---------- @@ -45,6 +48,11 @@ ``pySim-read`` allows you to read some data from a SIM card. It will only some files of the card, and will only read files accessible to a normal user (without any special authentication) +These days, you should use the ``export`` command of ``pySim-shell`` +instead. It performs a much more comprehensive export of all of the +[standard] files that can be found on the card. To get a human-readable +decode instead of the raw hex export, you can use ``export --json``. + Specifically, pySim-read will dump the following: * MF -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9ca6b9d8c35e23be2ec8752107bb7d1e4f6f9bc1 Gerrit-Change-Number: 27208 Gerrit-PatchSet: 1 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

3 years, 4 months

1
0
0 0

Change in pysim[master]: pySim-shell: export: Add FCP template to export

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27209 ) Change subject: pySim-shell: export: Add FCP template to export ...................................................................... pySim-shell: export: Add FCP template to export The FCP template provides us a lot of context, like the permissions of a given file. Let's make it part of the 'export' output, both in raw and in decoded form. Change-Id: I05f17bbebd7a9b3535204b821900851a5f66e88f Closes: OS#5457 --- M pySim-shell.py M pySim/filesystem.py 2 files changed, 6 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pySim-shell.py b/pySim-shell.py index 12f35fd..ad76ba0 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -532,6 +532,8 @@ structure = self._cmd.rs.selected_file_structure() self._cmd.poutput("# structure: %s" % str(structure)) + self._cmd.poutput("# RAW FCP Template: %s" % str(self._cmd.rs.selected_file_fcp_hex)) + self._cmd.poutput("# Decoded FCP Template: %s" % str(self._cmd.rs.selected_file_fcp)) for f in df_path_list: self._cmd.poutput("select " + str(f)) diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 8303a4b..f8b86c5 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -1221,6 +1221,8 @@ self.card = card self.selected_file = self.mf # type: CardDF self.profile = profile + self.selected_file_fcp = None + self.selected_file_fcp_hex = None # make sure the class and selection control bytes, which are specified # by the card profile are used @@ -1464,7 +1466,8 @@ select_resp = f.decode_select_response(data) else: select_resp = self.probe_file(name, cmd_app) - # store the decoded FCP for later reference + # store the raw + decoded FCP for later reference + self.selected_file_fcp_hex = data self.selected_file_fcp = select_resp self._select_post(cmd_app) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I05f17bbebd7a9b3535204b821900851a5f66e88f Gerrit-Change-Number: 27209 Gerrit-PatchSet: 1 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

3 years, 4 months

1
0
0 0

Change in pysim[master]: ts_102_221: Implement File Descriptor using construct

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27188 ) Change subject: ts_102_221: Implement File Descriptor using construct ...................................................................... ts_102_221: Implement File Descriptor using construct This automatically adds encoding support, which is needed for upcoming CREATE FILE support. Change-Id: Ia40dba4aab6ceb9d81fd170f7efa8dad1f9b43d0 --- M docs/shell.rst M pySim-shell.py M pySim/filesystem.py M pySim/ts_102_221.py M pySim/ts_51_011.py 5 files changed, 50 insertions(+), 43 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/docs/shell.rst b/docs/shell.rst index 3ab1113..58588a2 100644 --- a/docs/shell.rst +++ b/docs/shell.rst @@ -80,9 +80,11 @@ pySIM-shell (MF)> select ADF.USIM { "file_descriptor": { - "shareable": true, - "file_type": "df", - "structure": "no_info_given" + "file_descriptor_byte": { + "shareable": true, + "file_type": "df", + "structure": "no_info_given" + } }, "df_name": "A0000000871002FFFFFFFF8907090000", "proprietary_info": { diff --git a/pySim-shell.py b/pySim-shell.py index a82d56f..e58151b 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -528,8 +528,7 @@ self._cmd.poutput("# file: %s (%s)" % ( self._cmd.rs.selected_file.name, self._cmd.rs.selected_file.fid)) - fd = fcp_dec['file_descriptor'] - structure = fd['structure'] + structure = self._cmd.rs.selected_file_structure() self._cmd.poutput("# structure: %s" % str(structure)) for f in df_path_list: @@ -545,8 +544,8 @@ self._cmd.poutput("update_binary " + str(result[0])) elif structure == 'cyclic' or structure == 'linear_fixed': # Use number of records specified in select response - if 'num_of_rec' in fd: - num_of_rec = fd['num_of_rec'] + num_of_rec = self._cmd.rs.selected_file_num_of_rec() + if num_of_rec: for r in range(1, num_of_rec + 1): if as_json: result = self._cmd.rs.read_record_dec(r) diff --git a/pySim/filesystem.py b/pySim/filesystem.py index bef9005..a354dfb 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -773,7 +773,7 @@ @cmd2.with_argparser(read_recs_parser) def do_read_records(self, opts): """Read all records from a record-oriented EF""" - num_of_rec = self._cmd.rs.selected_file_fcp['file_descriptor']['num_of_rec'] + num_of_rec = self._cmd.rs.selected_file_num_of_rec() for recnr in range(1, 1 + num_of_rec): (data, sw) = self._cmd.rs.read_record(recnr) if (len(data) > 0): @@ -789,7 +789,7 @@ @cmd2.with_argparser(read_recs_dec_parser) def do_read_records_decoded(self, opts): """Read + decode all records from a record-oriented EF""" - num_of_rec = self._cmd.rs.selected_file_fcp['file_descriptor']['num_of_rec'] + num_of_rec = self._cmd.rs.selected_file_num_of_rec() # collect all results in list so they are rendered as JSON list when printing data_list = [] for recnr in range(1, 1 + num_of_rec): @@ -1279,6 +1279,21 @@ pass return apps_taken + def selected_file_descriptor_byte(self) -> dict: + return self.selected_file_fcp['file_descriptor']['file_descriptor_byte'] + + def selected_file_shareable(self) -> bool: + return self.selected_file_descriptor_byte()['shareable'] + + def selected_file_structure(self) -> str: + return self.selected_file_descriptor_byte()['structure'] + + def selected_file_type(self) -> str: + return self.selected_file_descriptor_byte()['file_type'] + + def selected_file_num_of_rec(self) -> Optional[int]: + return self.selected_file_fcp['file_descriptor'].get('num_of_rec') + def reset(self, cmd_app=None) -> Hexstr: """Perform physical card reset and obtain ATR. Args: @@ -1350,11 +1365,11 @@ raise RuntimeError("%s: %s - %s" % (swm.sw_actual, k[0], k[1])) select_resp = self.selected_file.decode_select_response(data) - if (select_resp['file_descriptor']['file_type'] == 'df'): + if (select_resp['file_descriptor']['file_descriptor_byte']['file_type'] == 'df'): f = CardDF(fid=fid, sfid=None, name="DF." + str(fid).upper(), desc="dedicated file, manually added at runtime") else: - if (select_resp['file_descriptor']['structure'] == 'transparent'): + if (select_resp['file_descriptor']['file_descriptor_byte']['structure'] == 'transparent'): f = TransparentEF(fid=fid, sfid=None, name="EF." + str(fid).upper(), desc="elementary file, manually added at runtime") else: diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index 82776a0..022a4a7 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -18,6 +18,7 @@ """ from construct import * +from construct import Optional as COptional from pySim.construct import * from pySim.utils import * from pySim.filesystem import * @@ -87,34 +88,22 @@ # ETSI TS 102 221 11.1.1.4.3 class FileDescriptor(BER_TLV_IE, tag=0x82): - def _from_bytes(self, in_bin: bytes): - out = {} - ft_dict = { - 0: 'working_ef', - 1: 'internal_ef', - 7: 'df' - } - fs_dict = { - 0: 'no_info_given', - 1: 'transparent', - 2: 'linear_fixed', - 6: 'cyclic', - 0x39: 'ber_tlv', - } - fdb = in_bin[0] - ftype = (fdb >> 3) & 7 - if fdb & 0xbf == 0x39: - fstruct = 0x39 - else: - fstruct = fdb & 7 - out['shareable'] = True if fdb & 0x40 else False - out['file_type'] = ft_dict[ftype] if ftype in ft_dict else ftype - out['structure'] = fs_dict[fstruct] if fstruct in fs_dict else fstruct - if len(in_bin) >= 5: - out['record_len'] = int.from_bytes(in_bin[2:4], 'big') - out['num_of_rec'] = int.from_bytes(in_bin[4:5], 'big') - self.decoded = out - return self.decoded + class BerTlvAdapter(Adapter): + def _parse(self, obj, context, path): + if obj == 0x39: + return 'ber_tlv' + raise ValidationError + def _build(self, obj, context, path): + if obj == 'ber_tlv': + return 0x39 + raise ValidationError + + FDB = Select(BitStruct(Const(0, Bit), 'shareable'/Flag, 'structure'/BerTlvAdapter(Const(0x39, BitsInteger(6)))), + BitStruct(Const(0, Bit), 'shareable'/Flag, 'file_type'/Enum(BitsInteger(3), working_ef=0, internal_ef=1, df=7), + 'structure'/Enum(BitsInteger(3), no_info_given=0, transparent=1, linear_fixed=2, cyclic=6)) + ) + _construct = Struct('file_descriptor_byte'/FDB, Const(b'\x21'), + 'record_len'/COptional(Int16ub), 'num_of_rec'/COptional(Int16ub)) # ETSI TS 102 221 11.1.1.4.4 class FileIdentifier(BER_TLV_IE, tag=0x83): @@ -668,7 +657,7 @@ @cmd2.with_argparser(LinFixedEF.ShellCommands.read_recs_dec_parser) def do_read_arr_records(self, opts): """Read + decode all EF.ARR records in flattened, human-friendly form.""" - num_of_rec = self._cmd.rs.selected_file_fcp['file_descriptor']['num_of_rec'] + num_of_rec = self._cmd.rs.selected_file_num_of_rec() # collect all results in list so they are rendered as JSON list when printing data_list = [] for recnr in range(1, 1 + num_of_rec): diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 5e430ea..ddfed95 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -1109,7 +1109,9 @@ 4: 'working_ef' } ret = { - 'file_descriptor': {}, + 'file_descriptor': { + 'file_descriptor_byte': {}, + }, 'proprietary_info': {}, } ret['file_id'] = b2h(resp_bin[4:6]) @@ -1117,7 +1119,7 @@ resp_bin[2:4], 'big') file_type = type_of_file_map[resp_bin[6] ] if resp_bin[6] in type_of_file_map else resp_bin[6] - ret['file_descriptor']['file_type'] = file_type + ret['file_descriptor']['file_descriptor_byte']['file_type'] = file_type if file_type in ['mf', 'df']: ret['file_characteristics'] = b2h(resp_bin[13:14]) ret['num_direct_child_df'] = resp_bin[14] @@ -1127,7 +1129,7 @@ elif file_type in ['working_ef']: file_struct = struct_of_file_map[resp_bin[13] ] if resp_bin[13] in struct_of_file_map else resp_bin[13] - ret['file_descriptor']['structure'] = file_struct + ret['file_descriptor']['file_descriptor_byte']['structure'] = file_struct ret['access_conditions'] = b2h(resp_bin[8:10]) if resp_bin[11] & 0x01 == 0: ret['life_cycle_status_int'] = 'operational_activated' -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27188 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia40dba4aab6ceb9d81fd170f7efa8dad1f9b43d0 Gerrit-Change-Number: 27188 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

3 years, 4 months

1
0
0 0

Change in pysim[master]: pySim-shell: support TS 102 222 administrative commands

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27126 ) Change subject: pySim-shell: support TS 102 222 administrative commands ...................................................................... pySim-shell: support TS 102 222 administrative commands This adds support for creating/deleting and terminating files, as well as support for permanent card termination. Change-Id: I5b1ffb1334afa18d62beb642268066a30deb7ea6 --- M pySim-shell.py M pySim/commands.py M pySim/filesystem.py M pySim/ts_102_221.py A pySim/ts_102_222.py 5 files changed, 260 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pySim-shell.py b/pySim-shell.py index e58151b..12f35fd 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -49,6 +49,7 @@ from pySim.ts_51_011 import CardProfileSIM, DF_TELECOM, DF_GSM from pySim.ts_102_221 import CardProfileUICC from pySim.ts_102_221 import CardProfileUICCSIM +from pySim.ts_102_222 import Ts102222Commands from pySim.ts_31_102 import CardApplicationUSIM from pySim.ts_31_103 import CardApplicationISIM from pySim.ara_m import CardApplicationARAM @@ -174,6 +175,7 @@ 'conserve_write', False, self.conserve_write) self._onchange_apdu_trace('apdu_trace', False, self.apdu_trace) self.register_command_set(Iso7816Commands()) + self.register_command_set(Ts102222Commands()) self.register_command_set(PySimCommands()) self.iccid, sw = self.card.read_iccid() rs.select('MF', self) diff --git a/pySim/commands.py b/pySim/commands.py index 5e09eee..df23393 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -448,6 +448,26 @@ """ return self._tp.send_apdu_checksw(self.cla_byte + '44000002' + fid) + def create_file(self, payload: Hexstr): + """Execute CREEATE FILE command as per TS 102 222 Section 6.3""" + return self._tp.send_apdu_checksw(self.cla_byte + 'e00000%02x%s' % (len(payload)//2, payload)) + + def delete_file(self, fid): + """Execute DELETE FILE command as per TS 102 222 Section 6.4""" + return self._tp.send_apdu_checksw(self.cla_byte + 'e4000002' + fid) + + def terminate_df(self, fid): + """Execute TERMINATE DF command as per TS 102 222 Section 6.7""" + return self._tp.send_apdu_checksw(self.cla_byte + 'e6000002' + fid) + + def terminate_ef(self, fid): + """Execute TERMINATE EF command as per TS 102 222 Section 6.8""" + return self._tp.send_apdu_checksw(self.cla_byte + 'e8000002' + fid) + + def terminate_card_usage(self): + """Execute TERMINATE CARD USAGE command as per TS 102 222 Section 6.9""" + return self._tp.send_apdu_checksw(self.cla_byte + 'fe000000') + def manage_channel(self, mode='open', lchan_nr=0): """Execute MANAGE CHANNEL command as per TS 102 221 Section 11.1.17. diff --git a/pySim/filesystem.py b/pySim/filesystem.py index a354dfb..8303a4b 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -1475,6 +1475,10 @@ (data, sw) = self.card._scc.status() return self.selected_file.decode_select_response(data) + def get_file_for_selectable(self, name: str): + sels = self.selected_file.get_selectables() + return sels[name] + def activate_file(self, name: str): """Request ACTIVATE FILE of specified file.""" sels = self.selected_file.get_selectables() diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index 022a4a7..ac2a60e 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -107,11 +107,11 @@ # ETSI TS 102 221 11.1.1.4.4 class FileIdentifier(BER_TLV_IE, tag=0x83): - _construct = GreedyBytes + _construct = HexAdapter(GreedyBytes) # ETSI TS 102 221 11.1.1.4.5 class DfName(BER_TLV_IE, tag=0x84): - _construct = GreedyBytes + _construct = HexAdapter(GreedyBytes) # ETSI TS 102 221 11.1.1.4.6.1 class UiccCharacteristics(BER_TLV_IE, tag=0x80): @@ -157,12 +157,18 @@ class Platform2PlatformCatSecuredApdu(BER_TLV_IE, tag=0x89): _construct = GreedyBytes +# sysmoISIM-SJA2 specific +class ToolkitAccessConditions(BER_TLV_IE, tag=0xD2): + _construct = FlagsEnum(Byte, rfm_create=1, rfm_delete_terminate=2, other_applet_create=4, + other_applet_delete_terminate=8) + # ETSI TS 102 221 11.1.1.4.6.0 class ProprietaryInformation(BER_TLV_IE, tag=0xA5, nested=[UiccCharacteristics, ApplicationPowerConsumption, MinApplicationClockFrequency, AvailableMemory, FileDetails, ReservedFileSize, MaximumFileSize, - SupportedFilesystemCommands, SpecificUiccEnvironmentConditions]): + SupportedFilesystemCommands, SpecificUiccEnvironmentConditions, + ToolkitAccessConditions]): pass # ETSI TS 102 221 11.1.1.4.7.1 @@ -176,11 +182,11 @@ # ETSI TS 102 221 11.1.1.4.7.3 class SecurityAttribReferenced(BER_TLV_IE, tag=0x8b): # TODO: longer format with SEID - _construct = Struct('ef_arr_file_id'/Bytes(2), 'ef_arr_record_nr'/Int8ub) + _construct = Struct('ef_arr_file_id'/HexAdapter(Bytes(2)), 'ef_arr_record_nr'/Int8ub) # ETSI TS 102 221 11.1.1.4.8 class ShortFileIdentifier(BER_TLV_IE, tag=0x88): - _construct = Byte + _construct = HexAdapter(COptional(Bytes(1))) # ETSI TS 102 221 11.1.1.4.9 class LifeCycleStatusInteger(BER_TLV_IE, tag=0x8A): @@ -202,6 +208,23 @@ ret = lcsi self.decoded = ret return self.decoded + def _to_bytes(self): + if self.decoded == 'no_information': + return b'\x00' + elif self.decoded == 'creation': + return b'\x01' + elif self.decoded == 'initialization': + return b'\x03' + elif self.decoded == 'operational_activated': + return b'\x05' + elif self.decoded == 'operational_deactivated': + return b'\x04' + elif self.decoded == 'termination': + return b'\x0c' + elif isinstance(self.decoded, int): + return self.decoded.to_bytes(1, 'big') + else: + raise ValueError # ETSI TS 102 221 11.1.1.4.9 class PS_DO(BER_TLV_IE, tag=0x90): diff --git a/pySim/ts_102_222.py b/pySim/ts_102_222.py new file mode 100644 index 0000000..2c1d600 --- /dev/null +++ b/pySim/ts_102_222.py @@ -0,0 +1,206 @@ +#!/usr/bin/env python3 + +# Interactive shell for working with SIM / UICC / USIM / ISIM cards +# +# (C) 2022 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 typing import List + +import cmd2 +from cmd2 import style, fg, bg +from cmd2 import CommandSet, with_default_category, with_argparser +import argparse + +from pySim.ts_31_102 import EF_UST_map, EF_USIM_ADF_map +from pySim.ts_31_103 import EF_IST_map, EF_ISIM_ADF_map + +from pySim.exceptions import * +from pySim.utils import h2b, swap_nibbles, b2h, JsonEncoder + +from pySim.ts_102_221 import * + +@with_default_category('TS 102 222 Administrative Commands') +class Ts102222Commands(CommandSet): + """Administrative commands for telecommunication applications.""" + + def __init__(self): + super().__init__() + + delfile_parser = argparse.ArgumentParser() + delfile_parser.add_argument('--force-delete', action='store_true', + help='I really want to permanently delete the file. I know pySim cannot re-create it yet!') + delfile_parser.add_argument('NAME', type=str, help='File name or FID to delete') + + @cmd2.with_argparser(delfile_parser) + def do_delete_file(self, opts): + """Delete the specified file. DANGEROUS! See TS 102 222 Section 6.4. + This will permanently delete the specified file from the card. + pySim has no support to re-create files yet, and even if it did, your card may not allow it!""" + if not opts.force_delete: + self._cmd.perror("Refusing to permanently delete the file, please read the help text.") + return + f = self._cmd.rs.get_file_for_selectable(opts.NAME) + (data, sw) = self._cmd.card._scc.delete_file(f.fid) + + def complete_delete_file(self, text, line, begidx, endidx) -> List[str]: + """Command Line tab completion for DELETE FILE""" + index_dict = {1: self._cmd.rs.selected_file.get_selectable_names()} + return self._cmd.index_based_complete(text, line, begidx, endidx, index_dict=index_dict) + + termdf_parser = argparse.ArgumentParser() + termdf_parser.add_argument('--force', action='store_true', + help='I really want to terminate the file. I know I can not recover from it!') + termdf_parser.add_argument('NAME', type=str, help='File name or FID') + + @cmd2.with_argparser(termdf_parser) + def do_terminate_df(self, opts): + """Terminate the specified DF. DANGEROUS! See TS 102 222 6.7. + This is a permanent, one-way operation on the card. There is no undo, you can not recover + a terminated DF. The only permitted command for a terminated DF is the DLETE FILE command.""" + if not opts.force: + self._cmd.perror("Refusing to terminate the file, please read the help text.") + return + f = self._cmd.rs.get_file_for_selectable(opts.NAME) + (data, sw) = self._cmd.card._scc.terminate_df(f.fid) + + def complete_terminate_df(self, text, line, begidx, endidx) -> List[str]: + """Command Line tab completion for TERMINATE DF""" + index_dict = {1: self._cmd.rs.selected_file.get_selectable_names()} + return self._cmd.index_based_complete(text, line, begidx, endidx, index_dict=index_dict) + + @cmd2.with_argparser(termdf_parser) + def do_terminate_ef(self, opts): + """Terminate the specified EF. DANGEROUS! See TS 102 222 6.8. + This is a permanent, one-way operation on the card. There is no undo, you can not recover + a terminated EF. The only permitted command for a terminated EF is the DLETE FILE command.""" + if not opts.force: + self._cmd.perror("Refusing to terminate the file, please read the help text.") + return + f = self._cmd.rs.get_file_for_selectable(opts.NAME) + (data, sw) = self._cmd.card._scc.terminate_ef(f.fid) + + def complete_terminate_ef(self, text, line, begidx, endidx) -> List[str]: + """Command Line tab completion for TERMINATE EF""" + index_dict = {1: self._cmd.rs.selected_file.get_selectable_names()} + return self._cmd.index_based_complete(text, line, begidx, endidx, index_dict=index_dict) + + tcard_parser = argparse.ArgumentParser() + tcard_parser.add_argument('--force-terminate-card', action='store_true', + help='I really want to permanently terminate the card. It will not be usable afterwards!') + + @cmd2.with_argparser(tcard_parser) + def do_terminate_card_usage(self, opts): + """Terminate the Card. SUPER DANGEROUS! See TS 102 222 Section 6.9. + This will permanently brick the card and can NOT be recovered from!""" + if not opts.force_terminate_card: + self._cmd.perror("Refusing to permanently terminate the card, please read the help text.") + return + (data, sw) = self._cmd.card._scc.terminate_card_usage() + + create_parser = argparse.ArgumentParser() + create_parser.add_argument('FILE_ID', type=str, 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') + create_required.add_argument('--ef-arr-file-id', required=True, type=str, help='Referenced Security: File Identifier of EF.ARR') + create_required.add_argument('--ef-arr-record-nr', required=True, type=int, help='Referenced Security: Record Number within EF.ARR') + create_required.add_argument('--file-size', required=True, type=int, help='Size of file in octets') + create_required.add_argument('--structure', required=True, type=str, choices=['transparent', 'linear_fixed', 'ber_tlv'], + help='Structure of the to-be-created EF') + 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=int, help='Length of each record in octets') + + @cmd2.with_argparser(create_parser) + def do_create_ef(self, opts): + """Create a new EF below the currently selected DF. Requires related privileges.""" + file_descriptor = { + 'file_descriptor_byte': { + 'shareable': opts.shareable, + 'file_type': 'working_ef', + 'structure': opts.structure, + } + } + if opts.structure == 'linear_fixed': + if not opts.record_length: + self._cmd.perror("you must specify the --record-length for linear fixed EF") + return + file_descriptor['record_len'] = opts.record_length + elif opts.structure == 'ber_tlv': + self._cmd.perror("BER-TLV creation not yet fully supported, sorry") + return + ies = [FileDescriptor(decoded=file_descriptor), FileIdentifier(decoded=opts.FILE_ID), + LifeCycleStatusInteger(decoded='operational_activated'), + SecurityAttribReferenced(decoded={'ef_arr_file_id': opts.ef_arr_file_id, + 'ef_arr_record_nr': opts.ef_arr_record_nr }), + FileSize(decoded=opts.file_size), + ShortFileIdentifier(decoded=opts.short_file_id), + ] + fcp = FcpTemplate(children=ies) + (data, sw) = self._cmd.card._scc.create_file(b2h(fcp.to_tlv())) + # the newly-created file is automatically selected but our runtime state knows nothing of it + self._cmd.rs.select_file(self._cmd.rs.selected_file) + + createdf_parser = argparse.ArgumentParser() + createdf_parser.add_argument('FILE_ID', type=str, 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') + createdf_sja_optional = createdf_parser.add_argument_group('sysmoISIM-SJA optional arguments') + createdf_required.add_argument('--ef-arr-file-id', required=True, type=str, help='Referenced Security: File Identifier of EF.ARR') + createdf_required.add_argument('--ef-arr-record-nr', required=True, type=int, help='Referenced Security: Record Number within EF.ARR') + createdf_optional.add_argument('--shareable', action='store_true', help='Should the file be shareable?') + createdf_optional.add_argument('--aid', type=str, help='Application ID (creates an ADF, instead of a DF)') + # mandatory by spec, but ignored by several OS, so don't force the user + createdf_optional.add_argument('--total-file-size', type=int, help='Physical memory allocated for DF/ADi in octets') + createdf_sja_optional.add_argument('--permit-rfm-create', action='store_true') + 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') + + @cmd2.with_argparser(createdf_parser) + def do_create_df(self, opts): + """Create a new DF below the currently selected DF. Requires related privileges.""" + file_descriptor = { + 'file_descriptor_byte': { + 'shareable': opts.shareable, + 'file_type': 'df', + 'structure': 'no_info_given', + } + } + ies = [] + ies.append(FileDescriptor(decoded=file_descriptor)) + ies.append(FileIdentifier(decoded=opts.FILE_ID)) + if opts.aid: + ies.append(DfName(decoded=opts.aid)) + ies.append(LifeCycleStatusInteger(decoded='operational_activated')) + ies.append(SecurityAttribReferenced(decoded={'ef_arr_file_id': opts.ef_arr_file_id, + 'ef_arr_record_nr': opts.ef_arr_record_nr })) + if opts.total_file_size: + ies.append(TotalFileSize(decoded=opts.total_file_size)) + # TODO: Spec states PIN Status Template DO is mandatory + if opts.permit_rfm_create or opts.permit_rfm_delete_terminate or opts.permit_other_applet_create or opts.permit_other_applet_delete_terminate: + toolkit_ac = { + 'rfm_create': opts.permit_rfm_create, + 'rfm_delete_terminate': opts.permit_rfm_delete_terminate, + 'other_applet_create': opts.permit_other_applet_create, + 'other_applet_delete_terminate': opts.permit_other_applet_delete_terminate, + } + ies.append(ProprietaryInformation(children=[ToolkitAccessConditions(decoded=toolkit_ac)])) + fcp = FcpTemplate(children=ies) + (data, sw) = self._cmd.card._scc.create_file(b2h(fcp.to_tlv())) + # the newly-created file is automatically selected but our runtime state knows nothing of it + self._cmd.rs.select_file(self._cmd.rs.selected_file) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5b1ffb1334afa18d62beb642268066a30deb7ea6 Gerrit-Change-Number: 27126 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: herlesupreeth <herlesupreeth(a)gmail.com> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in pysim[master]: Add scripts/deacivate-5g.script

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27238 ) Change subject: Add scripts/deacivate-5g.script ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5dc3e9f0ae76a7ae57484e5a3369e11ff02c7eca Gerrit-Change-Number: 27238 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 18 Feb 2022 11:56:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in pysim[master]: doc: Improve documentation in various places

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27237 ) Change subject: doc: Improve documentation in various places ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib88bb7d12faaac7d149ee1f6379bc128b83bbdd5 Gerrit-Change-Number: 27237 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 18 Feb 2022 11:56:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2022