<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/23536">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fileystem: fix ADF selection<br><br>When the ADF is selected, then this is done by the AID. At the moment<br>only the first 7 bytes of the AID are used to select the ADF.<br>sysmo-isim-sja2 tolerates this, but sysmo-usim-sjs1 does not. The Cards<br>class already has methods to deal with this problem. The method<br>select_adf_by_aid takes an ADF name and completes the AID from an<br>internal list. This can be extended to support partial hexadecimal AIDs<br>as well.<br><br>Change-Id: If99b143ae5ff42a889c52e8023084692e709e1b1<br>Related: OS#4963<br>---<br>M pySim-read.py<br>M pySim/cards.py<br>M pySim/filesystem.py<br>3 files changed, 26 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/36/23536/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim-read.py b/pySim-read.py</span><br><span>index 7906685..638bd4b 100755</span><br><span>--- a/pySim-read.py</span><br><span>+++ b/pySim-read.py</span><br><span>@@ -251,7 +251,8 @@</span><br><span> </span><br><span> # Check whether we have th AID of USIM, if so select it by its AID</span><br><span> # EF.UST - File Id in ADF USIM : 6f38</span><br><span style="color: hsl(0, 100%, 40%);">- if '9000' == card.select_adf_by_aid():</span><br><span style="color: hsl(120, 100%, 40%);">+ data, sw = card.select_adf_by_aid(adf="usim")</span><br><span style="color: hsl(120, 100%, 40%);">+ if sw == '9000':</span><br><span> # Select USIM profile</span><br><span> usim_card = UsimCard(scc)</span><br><span> </span><br><span>@@ -300,7 +301,8 @@</span><br><span> print("ePDGSelection: Can't read file -- " + str(e))</span><br><span> </span><br><span> # Select ISIM application by its AID</span><br><span style="color: hsl(0, 100%, 40%);">- if '9000' == card.select_adf_by_aid(adf="isim"):</span><br><span style="color: hsl(120, 100%, 40%);">+ data, sw = card.select_adf_by_aid(adf="isim")</span><br><span style="color: hsl(120, 100%, 40%);">+ if sw == '9000':</span><br><span> # Select USIM profile</span><br><span> isim_card = IsimCard(scc)</span><br><span> </span><br><span>@@ -352,7 +354,8 @@</span><br><span> </span><br><span> # Check whether we have th AID of ISIM, if so select it by its AID</span><br><span> # EF.IST - File Id in ADF ISIM : 6f07</span><br><span style="color: hsl(0, 100%, 40%);">- if '9000' == card.select_adf_by_aid(adf="isim"):</span><br><span style="color: hsl(120, 100%, 40%);">+ data, sw = card.select_adf_by_aid(adf="isim")</span><br><span style="color: hsl(120, 100%, 40%);">+ if sw == '9000':</span><br><span> # EF.IST</span><br><span> (res, sw) = card.read_binary('6f07')</span><br><span> if sw == '9000':</span><br><span>diff --git a/pySim/cards.py b/pySim/cards.py</span><br><span>index 857d0b6..57a2bf0 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -224,21 +224,21 @@</span><br><span> </span><br><span> # Select ADF.U/ISIM in the Card using its full AID</span><br><span> 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(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 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%);">+ # 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> </span><br><span> # Erase the contents of a file</span><br><span> def erase_binary(self, ef):</span><br><span>@@ -1335,7 +1335,8 @@</span><br><span> self._scc.update_binary('6f20', p['opc'], 17)</span><br><span> </span><br><span> # update EF-USIM_AUTH_KEY in ADF.ISIM</span><br><span style="color: hsl(0, 100%, 40%);">- if '9000' == self.select_adf_by_aid(adf="isim"):</span><br><span style="color: hsl(120, 100%, 40%);">+ data, sw = self.select_adf_by_aid(adf="isim")</span><br><span style="color: hsl(120, 100%, 40%);">+ if sw == '9000':</span><br><span> if p.get('ki'):</span><br><span> self._scc.update_binary('af20', p['ki'], 1)</span><br><span> if p.get('opc'):</span><br><span>@@ -1382,7 +1383,8 @@</span><br><span> if sw != '9000':</span><br><span> print("Programming IMPU failed with code %s"%sw)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if '9000' == self.select_adf_by_aid():</span><br><span style="color: hsl(120, 100%, 40%);">+ data, sw = self.select_adf_by_aid(adf="usim")</span><br><span style="color: hsl(120, 100%, 40%);">+ if sw == '9000':</span><br><span> # update EF-USIM_AUTH_KEY in ADF.USIM</span><br><span> if p.get('ki'):</span><br><span> self._scc.update_binary('af20', p['ki'], 1)</span><br><span>diff --git a/pySim/filesystem.py b/pySim/filesystem.py</span><br><span>index 2c1fe8b..1f43bea 100644</span><br><span>--- a/pySim/filesystem.py</span><br><span>+++ b/pySim/filesystem.py</span><br><span>@@ -654,7 +654,7 @@</span><br><span> cmd_app.unregister_command_set(c)</span><br><span> try:</span><br><span> if isinstance(f, CardADF):</span><br><span style="color: hsl(0, 100%, 40%);">- (data, sw) = self.card._scc.select_adf(f.aid)</span><br><span style="color: hsl(120, 100%, 40%);">+ (data, sw) = self.card.select_adf_by_aid(f.aid)</span><br><span> else:</span><br><span> (data, sw) = self.card._scc.select_file(f.fid)</span><br><span> self.selected_file = f</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/23536">change 23536</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/+/23536"/><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: If99b143ae5ff42a889c52e8023084692e709e1b1 </div>
<div style="display:none"> Gerrit-Change-Number: 23536 </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>