<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/24146">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cards: move methods read_aids and select_adf_by_aid to class UsimCard<br><br>A SimCard does not have ISIM or USIM applications, nor does it have an<br>EF.DIR to look at. It is not logical to implement them in the SimCard<br>class. Lets move those methods to the UsimCard, which makes more sense.<br><br>Change-Id: I71667b7b38c930b4e0409fe2ba2786e1db9cf9a3<br>---<br>M pySim/cards.py<br>1 file changed, 35 insertions(+), 35 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/46/24146/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 0fb7357..6e8b52a 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -238,41 +238,6 @@</span><br><span> else:</span><br><span> return (None, sw)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # Fetch all the AIDs present on UICC</span><br><span style="color: hsl(0, 100%, 40%);">- def read_aids(self):</span><br><span style="color: hsl(0, 100%, 40%);">- self._aids = []</span><br><span style="color: hsl(0, 100%, 40%);">- try:</span><br><span style="color: hsl(0, 100%, 40%);">- # Find out how many records the EF.DIR has</span><br><span style="color: hsl(0, 100%, 40%);">- # and store all the AIDs in the UICC</span><br><span style="color: hsl(0, 100%, 40%);">- rec_cnt = self._scc.record_count(EF['DIR'])</span><br><span style="color: hsl(0, 100%, 40%);">- for i in range(0, rec_cnt):</span><br><span style="color: hsl(0, 100%, 40%);">- rec = self._scc.read_record(EF['DIR'], i + 1)</span><br><span style="color: hsl(0, 100%, 40%);">- if (rec[0][0:2], rec[0][4:6]) == ('61', '4f') and len(rec[0]) > 12 \</span><br><span style="color: hsl(0, 100%, 40%);">- and rec[0][8:8 + int(rec[0][6:8], 16) * 2] not in self._aids:</span><br><span style="color: hsl(0, 100%, 40%);">- self._aids.append(rec[0][8:8 + int(rec[0][6:8], 16) * 2])</span><br><span style="color: hsl(0, 100%, 40%);">- except Exception as e:</span><br><span style="color: hsl(0, 100%, 40%);">- print("Can't read AIDs from SIM -- %s" % (str(e),))</span><br><span style="color: hsl(0, 100%, 40%);">- self._aids = []</span><br><span style="color: hsl(0, 100%, 40%);">- return self._aids</span><br><span style="color: hsl(0, 100%, 40%);">-</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(0, 100%, 40%);">- 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 style="color: hsl(0, 100%, 40%);">- 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(0, 100%, 40%);">- # Find full AID by application name:</span><br><span style="color: hsl(0, 100%, 40%);">- elif adf in ["usim", "isim"]:</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%);">- 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(0, 100%, 40%);">- return (None, None)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> # Erase the contents of a file</span><br><span> def erase_binary(self, ef):</span><br><span> len = self._scc.binary_size(ef)</span><br><span>@@ -356,6 +321,41 @@</span><br><span> (res, sw) = self._scc.update_binary(EF_USIM_ADF_map['UST'], content)</span><br><span> return sw</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # Fetch all the AIDs present on UICC</span><br><span style="color: hsl(120, 100%, 40%);">+ def read_aids(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ self._aids = []</span><br><span style="color: hsl(120, 100%, 40%);">+ try:</span><br><span style="color: hsl(120, 100%, 40%);">+ # Find out how many records the EF.DIR has</span><br><span style="color: hsl(120, 100%, 40%);">+ # and store all the AIDs in the UICC</span><br><span style="color: hsl(120, 100%, 40%);">+ rec_cnt = self._scc.record_count(EF['DIR'])</span><br><span style="color: hsl(120, 100%, 40%);">+ for i in range(0, rec_cnt):</span><br><span style="color: hsl(120, 100%, 40%);">+ rec = self._scc.read_record(EF['DIR'], i + 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rec[0][0:2], rec[0][4:6]) == ('61', '4f') and len(rec[0]) > 12 \</span><br><span style="color: hsl(120, 100%, 40%);">+ and rec[0][8:8 + int(rec[0][6:8], 16) * 2] not in self._aids:</span><br><span style="color: hsl(120, 100%, 40%);">+ self._aids.append(rec[0][8:8 + int(rec[0][6:8], 16) * 2])</span><br><span style="color: hsl(120, 100%, 40%);">+ except Exception as e:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Can't read AIDs from SIM -- %s" % (str(e),))</span><br><span style="color: hsl(120, 100%, 40%);">+ self._aids = []</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._aids</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Select ADF.U/ISIM in the Card using its full AID</span><br><span style="color: hsl(120, 100%, 40%);">+ def select_adf_by_aid(self, adf="usim"):</span><br><span style="color: hsl(120, 100%, 40%);">+ # Find full AID by partial AID:</span><br><span style="color: hsl(120, 100%, 40%);">+ if is_hex(adf):</span><br><span style="color: hsl(120, 100%, 40%);">+ for aid in self._aids:</span><br><span style="color: hsl(120, 100%, 40%);">+ if len(aid) >= len(adf) and adf == aid[0:len(adf)]:</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._scc.select_adf(aid)</span><br><span style="color: hsl(120, 100%, 40%);">+ # Find full AID by application name:</span><br><span style="color: hsl(120, 100%, 40%);">+ elif adf in ["usim", "isim"]:</span><br><span style="color: hsl(120, 100%, 40%);">+ # First (known) halves of the U/ISIM AID</span><br><span style="color: hsl(120, 100%, 40%);">+ aid_map = {}</span><br><span style="color: hsl(120, 100%, 40%);">+ aid_map["usim"] = "a0000000871002"</span><br><span style="color: hsl(120, 100%, 40%);">+ aid_map["isim"] = "a0000000871004"</span><br><span style="color: hsl(120, 100%, 40%);">+ for aid in self._aids:</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)</span><br><span style="color: hsl(120, 100%, 40%);">+ return (None, None)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> class IsimCard(UsimCard):</span><br><span> </span><br><span> name = 'ISIM'</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/24146">change 24146</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/+/24146"/><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: I71667b7b38c930b4e0409fe2ba2786e1db9cf9a3 </div>
<div style="display:none"> Gerrit-Change-Number: 24146 </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-MessageType: newchange </div>