<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/24347">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  fixeria: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bertlv_parse_one: Also return remainder after end of TLV<br><br>Change-Id: I10ebd87f72ee934561118b768108e5dc76277660<br>---<br>M pySim-shell.py<br>M pySim/filesystem.py<br>M pySim/utils.py<br>3 files changed, 6 insertions(+), 4 deletions(-)<br><br></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 bbfe7e9..0069661 100755</span><br><span>--- a/pySim-shell.py</span><br><span>+++ b/pySim-shell.py</span><br><span>@@ -265,7 +265,7 @@</span><br><span>                               tags = self._cmd.rs.retrieve_tags()</span><br><span>                          for t in tags:</span><br><span>                                       result = self._cmd.rs.retrieve_data(t)</span><br><span style="color: hsl(0, 100%, 40%);">-                                  (tag, l, val) = bertlv_parse_one(h2b(result[0]))</span><br><span style="color: hsl(120, 100%, 40%);">+                                      (tag, l, val, remainer) = bertlv_parse_one(h2b(result[0]))</span><br><span>                                   self._cmd.poutput("set_data 0x%02x %s" % (t, b2h(val)))</span><br><span>                    else:</span><br><span>                                raise RuntimeError('Unsupported structure "%s" of file "%s"' % (structure, filename))</span><br><span>diff --git a/pySim/filesystem.py b/pySim/filesystem.py</span><br><span>index 780da26..8cdb23e 100644</span><br><span>--- a/pySim/filesystem.py</span><br><span>+++ b/pySim/filesystem.py</span><br><span>@@ -1260,7 +1260,7 @@</span><br><span>         if not isinstance(self.selected_file, BerTlvEF):</span><br><span>             raise TypeError("Only works with BER-TLV EF")</span><br><span>         data, sw = self.card._scc.retrieve_data(self.selected_file.fid, 0x5c)</span><br><span style="color: hsl(0, 100%, 40%);">-        tag, length, value = bertlv_parse_one(h2b(data))</span><br><span style="color: hsl(120, 100%, 40%);">+        tag, length, value, remainder = bertlv_parse_one(h2b(data))</span><br><span>         return list(value)</span><br><span> </span><br><span>     def set_data(self, tag:int, data_hex:str):</span><br><span>diff --git a/pySim/utils.py b/pySim/utils.py</span><br><span>index 1191983..3d96580 100644</span><br><span>--- a/pySim/utils.py</span><br><span>+++ b/pySim/utils.py</span><br><span>@@ -155,7 +155,7 @@</span><br><span>   else:</span><br><span>                raise ValueError("Length > 32bits not supported")</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-def bertlv_parse_one(binary:bytes) -> (dict, int, bytes):</span><br><span style="color: hsl(120, 100%, 40%);">+def bertlv_parse_one(binary:bytes) -> (dict, int, bytes, bytes):</span><br><span>  """Parse a single TLV IE at the start of the given binary data.</span><br><span>       Args:</span><br><span>                binary : binary input data of BER-TLV length field</span><br><span>@@ -164,7 +164,9 @@</span><br><span>     """</span><br><span>   (tagdict, remainder) = bertlv_parse_tag(binary)</span><br><span>      (length, remainder) = bertlv_parse_len(remainder)</span><br><span style="color: hsl(0, 100%, 40%);">-       return (tagdict, length, remainder)</span><br><span style="color: hsl(120, 100%, 40%);">+   value = remainder[:length]</span><br><span style="color: hsl(120, 100%, 40%);">+    remainder = remainder[length:]</span><br><span style="color: hsl(120, 100%, 40%);">+        return (tagdict, length, value, remainder)</span><br><span> </span><br><span> </span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/24347">change 24347</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/+/24347"/><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: I10ebd87f72ee934561118b768108e5dc76277660 </div>
<div style="display:none"> Gerrit-Change-Number: 24347 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>