<p>guilly@gmail.com has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/17933">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cards.py: fix select_aif_by_aid function<br><br>current implementation does not work, as select_adf expects the<br>full name, as returned by read_aid.<br>turned it into a wrapper, otherwise it's not possible to do the<br>selection from an app<br><br>Change-Id: I1391869e5c302fdcc03e9972f179e865dfd443a9<br>---<br>M pySim/cards.py<br>M pySim/ts_51_011.py<br>2 files changed, 11 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/33/17933/1</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 c0462fb..89de66c 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -23,7 +23,7 @@</span><br><span> # along with this program.  If not, see <http://www.gnu.org/licenses/>.</span><br><span> #</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from pySim.ts_51_011 import EF, DF</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.ts_51_011 import EF, DF, MF</span><br><span> from pySim.utils import *</span><br><span> from smartcard.util import toBytes</span><br><span> </span><br><span>@@ -235,23 +235,14 @@</span><br><span>                      print("Can't read AIDs from SIM -- %s" % (str(e),))</span><br><span> </span><br><span>        # Select ADF.U/ISIM in the Card using its full AID</span><br><span style="color: hsl(0, 100%, 40%);">-      def select_adf_by_aid(self, adf="usim"):</span><br><span style="color: hsl(0, 100%, 40%);">-              # Check for valid ADF name</span><br><span style="color: hsl(0, 100%, 40%);">-              if adf not in ["usim", "isim"]:</span><br><span style="color: hsl(0, 100%, 40%);">-                     return None</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-             # First (known) halves of the U/ISIM AID</span><br><span style="color: hsl(0, 100%, 40%);">-                aid_map = {}</span><br><span style="color: hsl(0, 100%, 40%);">-            aid_map["usim"] = "a0000000871002"</span><br><span style="color: hsl(0, 100%, 40%);">-          aid_map["isim"] = "a0000000871004"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-          for aid in self._aids:</span><br><span style="color: hsl(0, 100%, 40%);">-                  if aid_map[adf] in aid:</span><br><span style="color: hsl(0, 100%, 40%);">-                         (res, sw) = self._scc.select_adf(aid)</span><br><span style="color: hsl(0, 100%, 40%);">-                           return sw</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-               return None</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+   def select_adf_by_aid(self, aid):</span><br><span style="color: hsl(120, 100%, 40%);">+             sw = self._scc.select_file(MF)</span><br><span style="color: hsl(120, 100%, 40%);">+                if sw == '9000':</span><br><span style="color: hsl(120, 100%, 40%);">+                      (res, sw) = self._scc.select_adf(aid)</span><br><span style="color: hsl(120, 100%, 40%);">+                 return sw</span><br><span style="color: hsl(120, 100%, 40%);">+             return (None, sw)</span><br><span style="color: hsl(120, 100%, 40%);">+             </span><br><span style="color: hsl(120, 100%, 40%);">+              </span><br><span> </span><br><span> class _MagicSimBase(Card):</span><br><span>   """</span><br><span>diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py</span><br><span>index 1cec91f..31e7b31 100644</span><br><span>--- a/pySim/ts_51_011.py</span><br><span>+++ b/pySim/ts_51_011.py</span><br><span>@@ -139,6 +139,8 @@</span><br><span> 'MMSUCP': '6FD2',</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+MF = [MF_num]</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DF = {</span><br><span> 'TELECOM':  [MF_num, DF_num['TELECOM']],</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/17933">change 17933</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/+/17933"/><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: I1391869e5c302fdcc03e9972f179e865dfd443a9 </div>
<div style="display:none"> Gerrit-Change-Number: 17933 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: guilly@gmail.com <guilly@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>