laforge has submitted this change. (
https://gerrit.osmocom.org/c/pysim/+/34850?usp=email )
(
3 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: pySim-shell: Include current logical channel in prompt
..
pySim-shell: Include current logical channel in prompt
Now that pySim-shell can switch between logical channels, let's state
the currently used logical channel in the prompt.
Change-Id: I45781a6fba205eeb4ac7f58d5cb642b7131bdd88
Related: OS#6230
---
M docs/shell.rst
M docs/suci-tutorial.rst
M pySim-shell.py
3 files changed, 49 insertions(+), 36 deletions(-)
Approvals:
dexter: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/docs/shell.rst b/docs/shell.rst
index 51fd49e..811ef61 100644
--- a/docs/shell.rst
+++ b/docs/shell.rst
@@ -68,7 +68,7 @@
::
- pySIM-shell (MF)> select
+ pySIM-shell (00:MF)> select
..2fe2 a000871004EF.ARRMF
2f00 3f00 ADF.ISIM EF.DIR
2f05 7f10 ADF.USIM EF.ICCID
@@ -85,7 +85,7 @@
::
- pySIM-shell (MF)> select ADF.USIM
+ pySIM-shell (00:MF)> select ADF.USIM
{
"file_descriptor": {
"file_descriptor_byte": {
@@ -103,7 +103,7 @@
"security_attrib_compact": "00",
"pin_status_template_do": "90017083010183018183010A83010B"
}
- pySIM-shell (MF/ADF.USIM)>
+ pySIM-shell (00:MF/ADF.USIM)>
status
@@ -116,7 +116,7 @@
::
- pySIM-shell (MF/ADF.ISIM)> status
+ pySIM-shell (00:MF/ADF.ISIM)> status
{
"file_descriptor": {
"file_descriptor_byte": {
@@ -261,7 +261,7 @@
Example:
::
- pySIM-shell (MF)> dir
+ pySIM-shell (00:MF)> dir
MF
3f00
.. ADF.USIMDF.SYSTEM EF.DIR EF.UMPC
@@ -295,7 +295,7 @@
Example:
::
- pySIM-shell (MF)> tree --help
+ pySIM-shell (00:MF)> tree --help
EF.DIR2f00 Application Directory
EF.ICCID 2fe2 ICC Identification
EF.PL 2f05 Preferred Languages
@@ -467,7 +467,7 @@
::
- pySIM-shell (MF/ADF.USIM/EF.AD)> read_binary_decoded
+ pySIM-shell (00:MF/ADF.USIM/EF.AD)> read_binary_decoded
{
"ms_operation_mode": "normal",
"specific_facilities": {
@@ -475,8 +475,8 @@
},
"len_of_mnc_in_imsi": 2
}
- pySIM-shell (MF/ADF.USIM/EF.AD)> update_binary_decoded --json-path
specific_facilities.ofm false
- pySIM-shell (MF/ADF.USIM/EF.AD)> read_binary_decoded
+ pySIM-shell (00:MF/ADF.USIM/EF.AD)> update_binary_decoded --json-path
specific_facilities.ofm false
+ pySIM-shell (00:MF/ADF.USIM/EF.AD)> read_binary_decoded
{
"ms_operation_mode": "normal",
"specific_facilities": {
@@ -731,7 +731,7 @@
::
- pySIM-shell (MF/ADF.ARA-M)> aram_get_all
+ pySIM-shell (00:MF/ADF.ARA-M)> aram_get_all
[
{
"ResponseAllRefArDO": [
@@ -783,7 +783,7 @@
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
--device-app-id E46872F28B350B7E1F140DE535C2A8D5804F0BE3 --android-permissions
0001 --apdu-always
+ pySIM-shell (00:MF/ADF.ARA-M)> aram_store_ref_ar_do --aid
--device-app-id E46872F28B350B7E1F140DE535C2A8D5804F0BE3 --android-permissions
0001 --apdu-always
aram_delete_all
@@ -845,10 +845,10 @@
::
- pySIM-shell (MF/EF.ICCID)> set numeric_path True
+ pySIM-shell (00:MF/EF.ICCID)> set numeric_path True
numeric_path - was: False
now: True
- pySIM-shell (3f00/2fe2)> set numeric_path False
+ pySIM-shell (00:3f00/2fe2)> set numeric_path False
numeric_path - was: True
now: False
- pySIM-shell (MF/EF.ICCID)> help set
+ pySIM-shell (00:MF/EF.ICCID)> help set
diff --git a/docs/suci-tutorial.rst b/docs/suci-tutorial.rst
index fc6e911..b4c950f 100644
--- a/docs/suci-tutorial.rst
+++ b/docs/suci-tutorial.rst
@@ -55,13 +55,13 @@
Using PC/SC reader interface
Autodetected card type: sysmoISIM-SJA2
Welcome to pySim-shell!
-pySIM-shell (MF)>
+pySIM-shell (00:MF)>
Enter the ADM PIN:
::
- pySIM-shell (MF)> verify_adm
+ pySIM-shell (00:MF)> verify_adm
Otherwise, write commands will fail with ``SW Mismatch: Expected 9000 and got
6982.``
@@ -70,16 +70,16 @@
::
- pySIM-shell (MF)> select MF
- pySIM-shell (MF)> select ADF.USIM
- pySIM-shell (MF/ADF.USIM)> select DF.5GS
- pySIM-shell (MF/ADF.USIM/DF.5GS)> select EF.SUCI_Calc_Info
+ pySIM-shell (00:MF)> select MF
+ pySIM-shell (00:MF)> select ADF.USIM
+ pySIM-shell (00:MF/ADF.USIM)> select DF.5GS
+ pySIM-shell (00:MF/ADF.USIM/DF.5GS)> select
