<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/26055">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">commands: do not check SW manually, use send_apdu_checksw()<br><br>The transport layer provides a method send_apdu_checksw to send APDUs<br>and to be sure the SW is the expected one. Given that, there is no need<br>to verify the SW manually. The exception of send_apdu_checksw will catch<br>the problem and also display the SW in a human readable form.<br><br>Change-Id: I9ce556ac0b7bb21c5c5a27170c32af0152255b79<br>Related: OS#5275<br>---<br>M pySim/commands.py<br>1 file changed, 6 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/55/26055/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim/commands.py b/pySim/commands.py</span><br><span>index 805fe61..dbe7e51 100644</span><br><span>--- a/pySim/commands.py</span><br><span>+++ b/pySim/commands.py</span><br><span>@@ -145,12 +145,9 @@</span><br><span> while chunk_offset < length:</span><br><span> chunk_len = min(255, length-chunk_offset)</span><br><span> pdu = self.cla_byte + 'b0%04x%02x' % (offset + chunk_offset, chunk_len)</span><br><span style="color: hsl(0, 100%, 40%);">- data,sw = self._tp.send_apdu(pdu)</span><br><span style="color: hsl(0, 100%, 40%);">- if sw == '9000':</span><br><span style="color: hsl(0, 100%, 40%);">- total_data += data</span><br><span style="color: hsl(0, 100%, 40%);">- chunk_offset += chunk_len</span><br><span style="color: hsl(0, 100%, 40%);">- else:</span><br><span style="color: hsl(0, 100%, 40%);">- raise ValueError('Failed to read (offset %d)' % (offset))</span><br><span style="color: hsl(120, 100%, 40%);">+ data, sw = self._tp.send_apdu_checksw(pdu)</span><br><span style="color: hsl(120, 100%, 40%);">+ total_data += data</span><br><span style="color: hsl(120, 100%, 40%);">+ chunk_offset += chunk_len</span><br><span> return total_data, sw</span><br><span> </span><br><span> def update_binary(self, ef, data:str, offset:int=0, verify:bool=False, conserve:bool=False):</span><br><span>@@ -172,19 +169,14 @@</span><br><span> </span><br><span> self.select_path(ef)</span><br><span> total_data = ''</span><br><span style="color: hsl(0, 100%, 40%);">- total_sw = "9000"</span><br><span> chunk_offset = 0</span><br><span> while chunk_offset < data_length:</span><br><span> chunk_len = min(255, data_length - chunk_offset)</span><br><span> # chunk_offset is bytes, but data slicing is hex chars, so we need to multiply by 2</span><br><span> pdu = self.cla_byte + 'd6%04x%02x' % (offset + chunk_offset, chunk_len) + data[chunk_offset*2 : (chunk_offset+chunk_len)*2]</span><br><span style="color: hsl(0, 100%, 40%);">- chunk_data, chunk_sw = self._tp.send_apdu(pdu)</span><br><span style="color: hsl(0, 100%, 40%);">- if chunk_sw == total_sw:</span><br><span style="color: hsl(0, 100%, 40%);">- total_data += chunk_data</span><br><span style="color: hsl(0, 100%, 40%);">- chunk_offset += chunk_len</span><br><span style="color: hsl(0, 100%, 40%);">- else:</span><br><span style="color: hsl(0, 100%, 40%);">- total_sw = chunk_sw</span><br><span style="color: hsl(0, 100%, 40%);">- raise ValueError('Failed to write chunk (chunk_offset %d, chunk_len %d)' % (chunk_offset, chunk_len))</span><br><span style="color: hsl(120, 100%, 40%);">+ chunk_data, chunk_sw = self._tp.send_apdu_checksw(pdu)</span><br><span style="color: hsl(120, 100%, 40%);">+ total_data += chunk_data</span><br><span style="color: hsl(120, 100%, 40%);">+ chunk_offset += chunk_len</span><br><span> if verify:</span><br><span> self.verify_binary(ef, data, offset)</span><br><span> return total_data, total_sw</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/26055">change 26055</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/+/26055"/><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: I9ce556ac0b7bb21c5c5a27170c32af0152255b79 </div>
<div style="display:none"> Gerrit-Change-Number: 26055 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>