laforge submitted this change.

View Change

Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved
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(-)

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 change 27209. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I05f17bbebd7a9b3535204b821900851a5f66e88f
Gerrit-Change-Number: 27209
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge@osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-MessageType: merged