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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">commands: fix __record_len()<br><br>When working with USIM/ISIMs, The method __record_len() that is used<br>by the record_count() method returns the length of the file instead<br>the actual record count. This causes record_count() to return always 1<br><br>Change-Id: If810c691893c022e9e9d87218dd0a334c5b2d579<br>---<br>M pySim/commands.py<br>1 file changed, 9 insertions(+), 7 deletions(-)<br><br></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 03540b6..f2bdf7a 100644</span><br><span>--- a/pySim/commands.py</span><br><span>+++ b/pySim/commands.py</span><br><span>@@ -30,8 +30,8 @@</span><br><span>           self._cla_byte = "a0"</span><br><span>              self.sel_ctrl = "0000"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    # Get file size from FCP</span><br><span style="color: hsl(0, 100%, 40%);">-        def __get_len_from_tlv(self, fcp):</span><br><span style="color: hsl(120, 100%, 40%);">+    # Extract a single FCP item from TLV</span><br><span style="color: hsl(120, 100%, 40%);">+  def __parse_fcp(self, fcp):</span><br><span>          # see also: ETSI TS 102 221, chapter 11.1.1.3.1 Response for MF,</span><br><span>             # DF or ADF</span><br><span>          from pytlv.TLV import TLV</span><br><span>@@ -58,9 +58,7 @@</span><br><span> </span><br><span>            # Skip FCP tag and length</span><br><span>            tlv = fcp[skip:]</span><br><span style="color: hsl(0, 100%, 40%);">-                tlv_parsed = tlvparser.parse(tlv)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-               return int(tlv_parsed['80'], 16)</span><br><span style="color: hsl(120, 100%, 40%);">+              return tlvparser.parse(tlv)</span><br><span> </span><br><span>      # Tell the length of a record by the card response</span><br><span>   # USIMs respond with an FCP template, which is different</span><br><span>@@ -69,7 +67,10 @@</span><br><span>        # SIM: GSM 11.11, chapter 9.2.1 SELECT</span><br><span>       def __record_len(self, r):</span><br><span>           if self.sel_ctrl == "0004":</span><br><span style="color: hsl(0, 100%, 40%);">-                   return self.__get_len_from_tlv(r[-1])</span><br><span style="color: hsl(120, 100%, 40%);">+                 tlv_parsed = self.__parse_fcp(r[-1])</span><br><span style="color: hsl(120, 100%, 40%);">+                  file_descriptor = tlv_parsed['82']</span><br><span style="color: hsl(120, 100%, 40%);">+                    # See also ETSI TS 102 221, chapter 11.1.1.4.3 File Descriptor</span><br><span style="color: hsl(120, 100%, 40%);">+                        return int(file_descriptor[4:8], 16)</span><br><span>                 else:</span><br><span>                        return int(r[-1][28:30], 16)</span><br><span> </span><br><span>@@ -77,7 +78,8 @@</span><br><span>         # above.</span><br><span>     def __len(self, r):</span><br><span>          if self.sel_ctrl == "0004":</span><br><span style="color: hsl(0, 100%, 40%);">-                   return self.__get_len_from_tlv(r[-1])</span><br><span style="color: hsl(120, 100%, 40%);">+                 tlv_parsed = self.__parse_fcp(r[-1])</span><br><span style="color: hsl(120, 100%, 40%);">+                  return int(tlv_parsed['80'], 16)</span><br><span>             else:</span><br><span>                        return int(r[-1][4:8], 16)</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/16660">change 16660</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/+/16660"/><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: If810c691893c022e9e9d87218dd0a334c5b2d579 </div>
<div style="display:none"> Gerrit-Change-Number: 16660 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>