<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/25873">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cards: Make select_adf_by_aid() use prefix AID selection<br><br>There is no need for us to expand a partial AID to the full AID before<br>selecting that ADF. The UICC specifications permit AID selection by<br>prefix only. So we can pass the prefix to the card, and the card will<br>do the prefix matching.<br><br>From the API user point of view, this allows us to select applications<br>not listed in EF.DIR<br><br>Change-Id: I0747b4e46ca7e30bd96d76053765080367ac1317<br>---<br>M pySim/cards.py<br>1 file changed, 4 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/73/25873/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 95352ff..305ca0c 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -282,22 +282,18 @@</span><br><span> self._aids = []</span><br><span> return self._aids</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # Select ADF.U/ISIM in the Card using its full AID</span><br><span style="color: hsl(120, 100%, 40%);">+ # Select ADF.U/ISIM in the Card using its AID</span><br><span> def select_adf_by_aid(self, adf="usim"):</span><br><span style="color: hsl(0, 100%, 40%);">- # Find full AID by partial AID:</span><br><span> if is_hex(adf):</span><br><span style="color: hsl(0, 100%, 40%);">- for aid in self._aids:</span><br><span style="color: hsl(0, 100%, 40%);">- if len(aid) >= len(adf) and adf == aid[0:len(adf)]:</span><br><span style="color: hsl(0, 100%, 40%);">- return self._scc.select_adf(aid)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._scc.select_adf(adf)</span><br><span> # Find full AID by application name:</span><br><span> elif adf in ["usim", "isim"]:</span><br><span> # First (known) halves of the U/ISIM AID</span><br><span> aid_map = {}</span><br><span> aid_map["usim"] = "a0000000871002"</span><br><span> aid_map["isim"] = "a0000000871004"</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%);">- return self._scc.select_adf(aid)</span><br><span style="color: hsl(120, 100%, 40%);">+ if aid_map[adf] in aid:</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._scc.select_adf(aid_map[adf])</span><br><span> return (None, None)</span><br><span> </span><br><span> # Erase the contents of a file</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/25873">change 25873</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/+/25873"/><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: I0747b4e46ca7e30bd96d76053765080367ac1317 </div>
<div style="display:none"> Gerrit-Change-Number: 25873 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>