<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/24405">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">shell: Fix activate_file + deactivate_file commands<br><br>We cannot re-activate a deactivated file after we have selected somethng<br>else, as SELECT will fail on the deactivated file. Hence, the<br>deactivate_file command needs to be used with a file name as argument.<br><br>Change-Id: Ief4d2bf8ea90497a8f25d1986aeea935c615f9bb<br>---<br>M pySim-shell.py<br>M pySim/commands.py<br>M pySim/filesystem.py<br>3 files changed, 18 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/05/24405/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim-shell.py b/pySim-shell.py</span><br><span>index edd8112..59bfa28 100755</span><br><span>--- a/pySim-shell.py</span><br><span>+++ b/pySim-shell.py</span><br><span>@@ -419,13 +419,17 @@</span><br><span> </span><br><span> def do_deactivate_file(self, opts):</span><br><span> """Deactivate the current EF"""</span><br><span style="color: hsl(0, 100%, 40%);">- fid = self._cmd.rs.selected_file.fid</span><br><span style="color: hsl(0, 100%, 40%);">- (data, sw) = self._cmd.card._scc.deactivate_file(fid)</span><br><span style="color: hsl(120, 100%, 40%);">+ (data, sw) = self._cmd.card._scc.deactivate_file()</span><br><span> </span><br><span> def do_activate_file(self, opts):</span><br><span style="color: hsl(0, 100%, 40%);">- """Activate the current EF"""</span><br><span style="color: hsl(0, 100%, 40%);">- fid = self._cmd.rs.selected_file.fid</span><br><span style="color: hsl(0, 100%, 40%);">- (data, sw) = self._cmd.card._scc.activate_file(fid)</span><br><span style="color: hsl(120, 100%, 40%);">+ """Activate the specified EF"""</span><br><span style="color: hsl(120, 100%, 40%);">+ path = opts.arg_list[0]</span><br><span style="color: hsl(120, 100%, 40%);">+ (data, sw) = self._cmd.rs.activate_file(path)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def complete_activate_file(self, text, line, begidx, endidx) -> List[str]:</span><br><span style="color: hsl(120, 100%, 40%);">+ """Command Line tab completion for ACTIVATE FILE"""</span><br><span style="color: hsl(120, 100%, 40%);">+ index_dict = { 1: self._cmd.rs.selected_file.get_selectable_names() }</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._cmd.index_based_complete(text, line, begidx, endidx, index_dict=index_dict)</span><br><span> </span><br><span> open_chan_parser = argparse.ArgumentParser()</span><br><span> open_chan_parser.add_argument('chan_nr', type=int, default=0, help='Channel Number')</span><br><span>diff --git a/pySim/commands.py b/pySim/commands.py</span><br><span>index 4640fe1..1fbea16 100644</span><br><span>--- a/pySim/commands.py</span><br><span>+++ b/pySim/commands.py</span><br><span>@@ -367,9 +367,9 @@</span><br><span> """Execute DECATIVATE FILE command as per TS 102 221 Section 11.1.14."""</span><br><span> return self._tp.send_apdu_constr_checksw(self.cla_byte, '04', '00', '00', None, None, None)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def activate_file(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ def activate_file(self, fid):</span><br><span> """Execute ACTIVATE FILE command as per TS 102 221 Section 11.1.15."""</span><br><span style="color: hsl(0, 100%, 40%);">- return self._tp.send_apdu_constr_checksw(self.cla_byte, '44', '00', '00', None, None, None)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._tp.send_apdu_checksw(self.cla_byte + '44000002' + fid)</span><br><span> </span><br><span> def manage_channel(self, mode='open', lchan_nr=0):</span><br><span> """Execute MANAGE CHANNEL command as per TS 102 221 Section 11.1.17."""</span><br><span>diff --git a/pySim/filesystem.py b/pySim/filesystem.py</span><br><span>index aaf333b..8c45ba1 100644</span><br><span>--- a/pySim/filesystem.py</span><br><span>+++ b/pySim/filesystem.py</span><br><span>@@ -1150,6 +1150,13 @@</span><br><span> (data, sw) = self.card._scc.status()</span><br><span> return self.selected_file.decode_select_response(data)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def activate_file(self, name:str):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Request ACTIVATE FILE of specified file."""</span><br><span style="color: hsl(120, 100%, 40%);">+ sels = self.selected_file.get_selectables()</span><br><span style="color: hsl(120, 100%, 40%);">+ f = sels[name]</span><br><span style="color: hsl(120, 100%, 40%);">+ data, sw = self.card._scc.activate_file(f.fid)</span><br><span style="color: hsl(120, 100%, 40%);">+ return data, sw</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def read_binary(self, length:int=None, offset:int=0):</span><br><span> """Read [part of] a transparent EF binary data.</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/24405">change 24405</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/pysim/+/24405"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: pysim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ief4d2bf8ea90497a8f25d1986aeea935c615f9bb </div>
<div style="display:none"> Gerrit-Change-Number: 24405 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>