<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/26041">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;">filesystem: fix reset mechanism<br><br>Currently we call the reset_card and get_atr methods directly at the<br>transport layer via the private _scc and _tp object of the card. This is<br>a violation. Fix and use the reset methods that are already in the<br>SimCard object.<br><br>Change-Id: I0e9d2a62a42a7387e7ca69d2ae830782a61aed89<br>---<br>M pySim/cards.py<br>M pySim/filesystem.py<br>2 files changed, 6 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim/cards.py b/pySim/cards.py</span><br><span>index 4511271..8f5004e 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -60,7 +60,11 @@</span><br><span>            self._aids = []</span><br><span> </span><br><span>  def reset(self):</span><br><span style="color: hsl(0, 100%, 40%);">-                self._scc.reset_card()</span><br><span style="color: hsl(120, 100%, 40%);">+                rc = self._scc.reset_card()</span><br><span style="color: hsl(120, 100%, 40%);">+           if rc is 1:</span><br><span style="color: hsl(120, 100%, 40%);">+                   return self._scc.get_atr()</span><br><span style="color: hsl(120, 100%, 40%);">+            else:</span><br><span style="color: hsl(120, 100%, 40%);">+                 return None</span><br><span> </span><br><span>      def erase(self):</span><br><span>             print("warning: erasing is not supported for specified card type!")</span><br><span>diff --git a/pySim/filesystem.py b/pySim/filesystem.py</span><br><span>index cc9176f..dcc2608 100644</span><br><span>--- a/pySim/filesystem.py</span><br><span>+++ b/pySim/filesystem.py</span><br><span>@@ -1068,8 +1068,7 @@</span><br><span>         Args:</span><br><span>             cmd_app : Command Application State (for unregistering old file commands)</span><br><span>         """</span><br><span style="color: hsl(0, 100%, 40%);">-        self.card._scc._tp.reset_card()</span><br><span style="color: hsl(0, 100%, 40%);">-        atr = i2h(self.card._scc._tp.get_atr())</span><br><span style="color: hsl(120, 100%, 40%);">+        atr = i2h(self.card.reset())</span><br><span>         # select MF to reset internal state and to verify card really works</span><br><span>         self.select('MF', cmd_app)</span><br><span>         return atr</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/26041">change 26041</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/+/26041"/><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: I0e9d2a62a42a7387e7ca69d2ae830782a61aed89 </div>
<div style="display:none"> Gerrit-Change-Number: 26041 </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>