<p>dexter <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13366">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sysmo-usim-sjs1: update EF.AD with correct MNC length<br><br>At the moment EF.AD, which contains the length of the MNC is not<br>updated. For two digit MNC (the usual case) this is fine since the<br>length is set to 2 by default. However, when one wants to set an MNC<br>with 3 digit length the file must be updated, otherwise the third digit<br>of the MNC is recognized as part of the MSIN.<br><br>Change-Id: I827092b2c7f7952f54b2d9f8dbda419a0dbfaf65<br>Related: OS#3850<br>---<br>M pySim-read.py<br>M pySim/cards.py<br>2 files changed, 26 insertions(+), 0 deletions(-)<br><br></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 4356453..bcdbca6 100755</span><br><span>--- a/pySim-read.py</span><br><span>+++ b/pySim-read.py</span><br><span>@@ -176,5 +176,12 @@</span><br><span> except Exception as e:</span><br><span> print "MSISDN: Can't read file -- " + str(e)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # EF.AD</span><br><span style="color: hsl(120, 100%, 40%);">+ (res, sw) = scc.read_binary(['3f00', '7f20', '6fad'])</span><br><span style="color: hsl(120, 100%, 40%);">+ if sw == '9000':</span><br><span style="color: hsl(120, 100%, 40%);">+ print("AD: %s" % (res,))</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("AD: Can't read, response code = %s" % (sw,))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Done for this card and maybe for everything ?</span><br><span> print "Done !\n"</span><br><span>diff --git a/pySim/cards.py b/pySim/cards.py</span><br><span>index 1012cfd..fb84a8d 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -118,6 +118,20 @@</span><br><span> data, sw = self._scc.update_record(EF['SMSP'], 1, rpad(smsp, 84))</span><br><span> return sw</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def update_ad(self, mnc):</span><br><span style="color: hsl(120, 100%, 40%);">+ #See also: 3GPP TS 31.102, chapter 4.2.18</span><br><span style="color: hsl(120, 100%, 40%);">+ mnclen = len(str(mnc))</span><br><span style="color: hsl(120, 100%, 40%);">+ if mnclen == 1:</span><br><span style="color: hsl(120, 100%, 40%);">+ mnclen = 2</span><br><span style="color: hsl(120, 100%, 40%);">+ if mnclen > 3:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise RuntimeError('unable to calculate proper mnclen')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ data = self._scc.read_binary(EF['AD'], length=None, offset=0)</span><br><span style="color: hsl(120, 100%, 40%);">+ size = len(data[0])/2</span><br><span style="color: hsl(120, 100%, 40%);">+ content = data[0][0:6] + "%02X" % mnclen</span><br><span style="color: hsl(120, 100%, 40%);">+ data, sw = self._scc.update_binary(EF['AD'], content)</span><br><span style="color: hsl(120, 100%, 40%);">+ return sw</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def read_spn(self):</span><br><span> (spn, sw) = self._scc.read_binary(EF['SPN'])</span><br><span> if sw == '9000':</span><br><span>@@ -593,6 +607,11 @@</span><br><span> if sw != '9000':</span><br><span> print("Programming OPLMNwAcT failed with code %s"%sw)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # EF.AD</span><br><span style="color: hsl(120, 100%, 40%);">+ if p.get('mcc') and p.get('mnc'):</span><br><span style="color: hsl(120, 100%, 40%);">+ sw = self.update_ad(p['mnc'])</span><br><span style="color: hsl(120, 100%, 40%);">+ if sw != '9000':</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Programming AD failed with code %s"%sw)</span><br><span> </span><br><span> # EF.SMSP</span><br><span> r = self._scc.select_file(['3f00', '7f10'])</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13366">change 13366</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/13366"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I827092b2c7f7952f54b2d9f8dbda419a0dbfaf65 </div>
<div style="display:none"> Gerrit-Change-Number: 13366 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>