<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/25840">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pySim-shell: Add suspend_uicc command<br><br>This is an optional command, and it is not supported by e.g. sysmoISIM-SJA2<br><br>Change-Id: Icc726ffd672744e56cc8dd3762891af507942c1e<br>---<br>M pySim-shell.py<br>M pySim/commands.py<br>2 files changed, 50 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/40/25840/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 3286db2..42ce0a5 100755</span><br><span>--- a/pySim-shell.py</span><br><span>+++ b/pySim-shell.py</span><br><span>@@ -546,6 +546,19 @@</span><br><span> fcp_dec = self._cmd.rs.status()</span><br><span> self._cmd.poutput_json(fcp_dec)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ suspend_uicc_parser = argparse.ArgumentParser()</span><br><span style="color: hsl(120, 100%, 40%);">+ suspend_uicc_parser.add_argument('--min-duration-secs', type=int, default=60,</span><br><span style="color: hsl(120, 100%, 40%);">+ help='Proposed minimum duration of suspension')</span><br><span style="color: hsl(120, 100%, 40%);">+ suspend_uicc_parser.add_argument('--max-duration-secs', type=int, default=24*60*60,</span><br><span style="color: hsl(120, 100%, 40%);">+ help='Proposed maximum duration of suspension')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # not ISO7816-4 but TS 102 221</span><br><span style="color: hsl(120, 100%, 40%);">+ @cmd2.with_argparser(suspend_uicc_parser)</span><br><span style="color: hsl(120, 100%, 40%);">+ def do_suspend_uicc(self, opts):</span><br><span style="color: hsl(120, 100%, 40%);">+ (duration, token, sw) = self._cmd.card._scc.suspend_uicc(min_len_secs=opts.min_duration_secs,</span><br><span style="color: hsl(120, 100%, 40%);">+ max_len_secs=opts.max_duration_secs)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._cmd.poutput('Negotiated Duration: %u secs, Token: %s, SW: %s' % (duration, token, sw))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> option_parser = argparse.ArgumentParser(prog='pySim-shell', description='interactive SIM card shell',</span><br><span> formatter_class=argparse.ArgumentDefaultsHelpFormatter)</span><br><span>diff --git a/pySim/commands.py b/pySim/commands.py</span><br><span>index d53cb3e..af31e82 100644</span><br><span>--- a/pySim/commands.py</span><br><span>+++ b/pySim/commands.py</span><br><span>@@ -23,7 +23,7 @@</span><br><span> </span><br><span> from construct import *</span><br><span> from pySim.construct import LV</span><br><span style="color: hsl(0, 100%, 40%);">-from pySim.utils import rpad, b2h, h2b, sw_match, bertlv_encode_len</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.utils import rpad, b2h, h2b, sw_match, bertlv_encode_len, Hexstr</span><br><span> from pySim.exceptions import SwMatchError</span><br><span> </span><br><span> class SimCardCommands(object):</span><br><span>@@ -448,3 +448,39 @@</span><br><span> data_length = len(payload) // 2</span><br><span> data, sw = self._tp.send_apdu(('80100000%02x' % data_length) + payload)</span><br><span> return (data, sw)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # ETSI TS 102 221 11.1.22</span><br><span style="color: hsl(120, 100%, 40%);">+ def suspend_uicc(self, min_len_secs:int=60, max_len_secs:int=43200):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Send SUSPEND UICC to the card."""</span><br><span style="color: hsl(120, 100%, 40%);">+ def encode_duration(secs:int) -> Hexstr:</span><br><span style="color: hsl(120, 100%, 40%);">+ if secs >= 10*24*60*60:</span><br><span style="color: hsl(120, 100%, 40%);">+ return '04%02x' % (secs // (10*24*60*60))</span><br><span style="color: hsl(120, 100%, 40%);">+ elif secs >= 24*60*60:</span><br><span style="color: hsl(120, 100%, 40%);">+ return '03%02x' % (secs // (24*60*60))</span><br><span style="color: hsl(120, 100%, 40%);">+ elif secs >= 60*60:</span><br><span style="color: hsl(120, 100%, 40%);">+ return '02%02x' % (secs // (60*60))</span><br><span style="color: hsl(120, 100%, 40%);">+ elif secs >= 60:</span><br><span style="color: hsl(120, 100%, 40%);">+ return '01%02x' % (secs // 60)</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ return '00%02x' % secs</span><br><span style="color: hsl(120, 100%, 40%);">+ def decode_duration(enc:Hexstr) -> int:</span><br><span style="color: hsl(120, 100%, 40%);">+ time_unit = enc[:2]</span><br><span style="color: hsl(120, 100%, 40%);">+ length = h2i(enc[2:4])</span><br><span style="color: hsl(120, 100%, 40%);">+ if time_unit == '04':</span><br><span style="color: hsl(120, 100%, 40%);">+ return length * 10*24*60*60</span><br><span style="color: hsl(120, 100%, 40%);">+ elif time_unit == '03':</span><br><span style="color: hsl(120, 100%, 40%);">+ return length * 24*60*60</span><br><span style="color: hsl(120, 100%, 40%);">+ elif time_unit == '02':</span><br><span style="color: hsl(120, 100%, 40%);">+ return length * 60*60</span><br><span style="color: hsl(120, 100%, 40%);">+ elif time_unit == '01':</span><br><span style="color: hsl(120, 100%, 40%);">+ return length * 60</span><br><span style="color: hsl(120, 100%, 40%);">+ elif time_unit == '00':</span><br><span style="color: hsl(120, 100%, 40%);">+ return length</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise ValueError('Time unit must be 0x00..0x04')</span><br><span style="color: hsl(120, 100%, 40%);">+ min_dur_enc = encode_duration(min_len_secs)</span><br><span style="color: hsl(120, 100%, 40%);">+ max_dur_enc = encode_duration(max_len_secs)</span><br><span style="color: hsl(120, 100%, 40%);">+ data, sw = self._tp.send_apdu_checksw('8076000004' + min_dur_enc + max_dur_enc)</span><br><span style="color: hsl(120, 100%, 40%);">+ negotiated_duration_secs = decode_duration(data[:4])</span><br><span style="color: hsl(120, 100%, 40%);">+ resume_token = data[4:]</span><br><span style="color: hsl(120, 100%, 40%);">+ return (negotiated_duration_secs, resumne_token, sw)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/25840">change 25840</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/+/25840"/><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: Icc726ffd672744e56cc8dd3762891af507942c1e </div>
<div style="display:none"> Gerrit-Change-Number: 25840 </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>