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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cards: remove unnecessary execptions.<br><br>The _scc.veryif_adm() method already does status word checking<br>internally and also raises an execption should the authentication be<br>unsuccessful, so we do not have to put an additional status word check +<br>execition when we use the method from cards.<br><br>Change-Id: I785d27e4d49a9cda1a771b56ce5ac9c1f1d1e79a<br>Related: OS#4963<br>---<br>M pySim/cards.py<br>1 file changed, 2 insertions(+), 10 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 8b51787..c640591 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -854,8 +854,6 @@</span><br><span>                 if not key:</span><br><span>                  raise ValueError("Please provide a PIN-ADM as there is no default one")</span><br><span>            (res, sw) = self._scc.verify_chv(0x0A, key)</span><br><span style="color: hsl(0, 100%, 40%);">-             if sw != '9000':</span><br><span style="color: hsl(0, 100%, 40%);">-                        raise RuntimeError('Failed to authenticate with ADM key %s'%(key))</span><br><span>           return sw</span><br><span> </span><br><span>        def program(self, p):</span><br><span>@@ -1045,9 +1043,7 @@</span><br><span>                # authenticate as ADM1</span><br><span>               if not p['pin_adm']:</span><br><span>                         raise ValueError("Please provide a PIN-ADM as there is no default one")</span><br><span style="color: hsl(0, 100%, 40%);">-               sw = self.verify_adm(h2b(p['pin_adm']))</span><br><span style="color: hsl(0, 100%, 40%);">-         if sw != '9000':</span><br><span style="color: hsl(0, 100%, 40%);">-                        raise RuntimeError('Failed to authenticate with ADM key %s'%(p['pin_adm'],))</span><br><span style="color: hsl(120, 100%, 40%);">+          self.verify_adm(h2b(p['pin_adm']))</span><br><span> </span><br><span>               # TODO: Set operator name</span><br><span>            if p.get('smsp') is not None:</span><br><span>@@ -1152,9 +1148,7 @@</span><br><span>        def program(self, p):</span><br><span>                if not p['pin_adm']:</span><br><span>                         raise ValueError("Please provide a PIN-ADM as there is no default one")</span><br><span style="color: hsl(0, 100%, 40%);">-               sw = self.verify_adm(h2b(p['pin_adm']))</span><br><span style="color: hsl(0, 100%, 40%);">-         if sw != '9000':</span><br><span style="color: hsl(0, 100%, 40%);">-                        raise RuntimeError('Failed to authenticate with ADM key %s'%(p['pin_adm'],))</span><br><span style="color: hsl(120, 100%, 40%);">+          self.verify_adm(h2b(p['pin_adm']))</span><br><span> </span><br><span>               # EF.ICCID</span><br><span>           # TODO: Add programming of the ICCID</span><br><span>@@ -1254,8 +1248,6 @@</span><br><span>                 if not key:</span><br><span>                  raise ValueError("Please provide a PIN-ADM as there is no default one")</span><br><span>            (res, sw) = self._scc.verify_chv(0x0A, key)</span><br><span style="color: hsl(0, 100%, 40%);">-             if sw != '9000':</span><br><span style="color: hsl(0, 100%, 40%);">-                        raise RuntimeError('Failed to authenticate with ADM key %s'%(key))</span><br><span>           return sw</span><br><span> </span><br><span>        def program(self, p):</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/23424">change 23424</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/+/23424"/><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: I785d27e4d49a9cda1a771b56ce5ac9c1f1d1e79a </div>
<div style="display:none"> Gerrit-Change-Number: 23424 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>