<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/23168">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;">cards.py: SJS1 + SJA2: Implement + Expose verify_adm() method<br><br>SJS1 and SJA2 card types don't use the generic verify_adm()<br>method of the Card base class, so they must override it with their<br>own methods.  Only this way application code can call card.verify_adm()<br>irrespective of the card type.<br><br>Change-Id: I05f7f3280873f006310266867f04a9ce1b0a63af<br>---<br>M pySim/cards.py<br>1 file changed, 18 insertions(+), 7 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 41dd179..dd8fe8b 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -849,12 +849,17 @@</span><br><span>                         return None</span><br><span>          return None</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def program(self, p):</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ def verify_adm(self, key):</span><br><span>           # authenticate as ADM using default key (written on the card..)</span><br><span style="color: hsl(0, 100%, 40%);">-         if not p['pin_adm']:</span><br><span style="color: hsl(120, 100%, 40%);">+          if not key:</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%);">-               self._scc.verify_chv(0x0A, h2b(p['pin_adm']))</span><br><span style="color: hsl(120, 100%, 40%);">+         (res, sw) = self._scc.verify_chv(0x0A, key)</span><br><span style="color: hsl(120, 100%, 40%);">+           if sw != '9000':</span><br><span style="color: hsl(120, 100%, 40%);">+                      raise RuntimeError('Failed to authenticate with ADM key %s'%(key))</span><br><span style="color: hsl(120, 100%, 40%);">+            return sw</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   def program(self, p):</span><br><span style="color: hsl(120, 100%, 40%);">+         self.verify_adm(h2b(p['pin_adm']))</span><br><span> </span><br><span>               # select MF</span><br><span>          r = self._scc.select_file(['3f00'])</span><br><span>@@ -1244,11 +1249,17 @@</span><br><span>                        return None</span><br><span>          return None</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def program(self, p):</span><br><span style="color: hsl(120, 100%, 40%);">+ def verify_adm(self, key):</span><br><span>           # authenticate as ADM using default key (written on the card..)</span><br><span style="color: hsl(0, 100%, 40%);">-         if not p['pin_adm']:</span><br><span style="color: hsl(120, 100%, 40%);">+          if not key:</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%);">-               self._scc.verify_chv(0x0A, h2b(p['pin_adm']))</span><br><span style="color: hsl(120, 100%, 40%);">+         (res, sw) = self._scc.verify_chv(0x0A, key)</span><br><span style="color: hsl(120, 100%, 40%);">+           if sw != '9000':</span><br><span style="color: hsl(120, 100%, 40%);">+                      raise RuntimeError('Failed to authenticate with ADM key %s'%(key))</span><br><span style="color: hsl(120, 100%, 40%);">+            return sw</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   def program(self, p):</span><br><span style="color: hsl(120, 100%, 40%);">+         self.verify_adm(h2b(p['pin_adm']))</span><br><span> </span><br><span>               # This type of card does not allow to reprogram the ICCID.</span><br><span>           # Reprogramming the ICCID would mess up the card os software</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/23168">change 23168</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/+/23168"/><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: I05f7f3280873f006310266867f04a9ce1b0a63af </div>
<div style="display:none"> Gerrit-Change-Number: 23168 </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: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>