<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/15496">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cards: use string representation for MNC/MCC<br><br>At the moment MNC and MCC are represented as integer numbers inside the<br>parameter array while all other parameters are represented as strings.<br>Lets use strings for MNC/MCC as well to simplify the parameter handling.<br>We will also not loose the length information in case of leading zeros.<br><br>Change-Id: Ia2333921a4863f0f26ee923ca796e62ec5e2d59a<br>---<br>M pySim-prog.py<br>M pySim/cards.py<br>2 files changed, 11 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/96/15496/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim-prog.py b/pySim-prog.py</span><br><span>index a462489..57a24d4 100755</span><br><span>--- a/pySim-prog.py</span><br><span>+++ b/pySim-prog.py</span><br><span>@@ -432,7 +432,7 @@</span><br><span> if 'smsp' in params:</span><br><span> s.append(" > SMSP : %(smsp)s")</span><br><span> s.append(" > ICCID : %(iccid)s")</span><br><span style="color: hsl(0, 100%, 40%);">- s.append(" > MCC/MNC : %(mcc)d/%(mnc)d")</span><br><span style="color: hsl(120, 100%, 40%);">+ s.append(" > MCC/MNC : %(mcc)s/%(mnc)s")</span><br><span> s.append(" > IMSI : %(imsi)s")</span><br><span> s.append(" > Ki : %(ki)s")</span><br><span> s.append(" > OPC : %(opc)s")</span><br><span>@@ -479,8 +479,8 @@</span><br><span> def read_params_csv(opts, imsi=None, iccid=None):</span><br><span> row = _read_params_csv(opts, iccid=iccid, imsi=imsi)</span><br><span> if row is not None:</span><br><span style="color: hsl(0, 100%, 40%);">- row['mcc'] = int(row.get('mcc', row['imsi'][0:3]))</span><br><span style="color: hsl(0, 100%, 40%);">- row['mnc'] = int(row.get('mnc', row['imsi'][3:5]))</span><br><span style="color: hsl(120, 100%, 40%);">+ row['mcc'] = row.get('mcc', row['imsi'][0:3])</span><br><span style="color: hsl(120, 100%, 40%);">+ row['mnc'] = row.get('mnc', row['imsi'][3:5])</span><br><span> pin_adm = None</span><br><span> # We need to escape the pin_adm we get from the csv</span><br><span> if 'pin_adm' in row:</span><br><span>diff --git a/pySim/cards.py b/pySim/cards.py</span><br><span>index cda337a..ec001ab 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -90,7 +90,7 @@</span><br><span> # get size and write EF.OPLMNwAcT</span><br><span> data = self._scc.read_binary(EF['OPLMNwAcT'], length=None, offset=0)</span><br><span> size = len(data[0])/2</span><br><span style="color: hsl(0, 100%, 40%);">- hplmn = enc_plmn(mcc, mnc)</span><br><span style="color: hsl(120, 100%, 40%);">+ hplmn = enc_plmn(int(mcc), int(mnc))</span><br><span> content = hplmn + access_tech</span><br><span> data, sw = self._scc.update_binary(EF['OPLMNwAcT'], content + 'ffffff0000' * (size/5-1))</span><br><span> return sw</span><br><span>@@ -102,7 +102,7 @@</span><br><span> # get size and write EF.PLMNwAcT</span><br><span> data = self._scc.read_binary(EF['PLMNwAcT'], length=None, offset=0)</span><br><span> size = len(data[0])/2</span><br><span style="color: hsl(0, 100%, 40%);">- hplmn = enc_plmn(mcc, mnc)</span><br><span style="color: hsl(120, 100%, 40%);">+ hplmn = enc_plmn(int(mcc), int(mnc))</span><br><span> content = hplmn + access_tech</span><br><span> data, sw = self._scc.update_binary(EF['PLMNwAcT'], content + 'ffffff0000' * (size/5-1))</span><br><span> return sw</span><br><span>@@ -110,7 +110,7 @@</span><br><span> def update_plmnsel(self, mcc, mnc):</span><br><span> data = self._scc.read_binary(EF['PLMNsel'], length=None, offset=0)</span><br><span> size = len(data[0])/2</span><br><span style="color: hsl(0, 100%, 40%);">- hplmn = enc_plmn(mcc, mnc)</span><br><span style="color: hsl(120, 100%, 40%);">+ hplmn = enc_plmn(int(mcc), int(mnc))</span><br><span> data, sw = self._scc.update_binary(EF['PLMNsel'], hplmn + 'ff' * (size-3))</span><br><span> return sw</span><br><span> </span><br><span>@@ -200,7 +200,7 @@</span><br><span> self._scc.select_file(['3f00', '7f4d'])</span><br><span> </span><br><span> # Home PLMN in PLMN_Sel format</span><br><span style="color: hsl(0, 100%, 40%);">- hplmn = enc_plmn(p['mcc'], p['mnc'])</span><br><span style="color: hsl(120, 100%, 40%);">+ hplmn = enc_plmn(int(p['mcc']), int(p['mnc']))</span><br><span> </span><br><span> # Operator name ( 3f00/7f4d/8f0c )</span><br><span> self._scc.update_record(self._files['name'][0], 2,</span><br><span>@@ -244,7 +244,7 @@</span><br><span> r = self._scc.select_file(['3f00', '7f20', '6f30'])</span><br><span> tl = int(r[-1][4:8], 16)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- hplmn = enc_plmn(p['mcc'], p['mnc'])</span><br><span style="color: hsl(120, 100%, 40%);">+ hplmn = enc_plmn(int(p['mcc']), int(p['mnc']))</span><br><span> self._scc.update_binary('6f30', hplmn + 'ff' * (tl-3))</span><br><span> </span><br><span> def erase(self):</span><br><span>@@ -330,7 +330,7 @@</span><br><span> r = self._scc.select_file(['3f00', '7f20', '6f30'])</span><br><span> tl = int(r[-1][4:8], 16)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- hplmn = enc_plmn(p['mcc'], p['mnc'])</span><br><span style="color: hsl(120, 100%, 40%);">+ hplmn = enc_plmn(int(p['mcc']), int(p['mnc']))</span><br><span> self._scc.update_binary('6f30', hplmn + 'ff' * (tl-3))</span><br><span> </span><br><span> # Get total number of entries and entry size</span><br><span>@@ -405,7 +405,7 @@</span><br><span> # EF.HPLMN</span><br><span> r = self._scc.select_file(['3f00', '7f20', '6f30'])</span><br><span> size = int(r[-1][4:8], 16)</span><br><span style="color: hsl(0, 100%, 40%);">- hplmn = enc_plmn(p['mcc'], p['mnc'])</span><br><span style="color: hsl(120, 100%, 40%);">+ hplmn = enc_plmn(int(p['mcc']), int(p['mnc']))</span><br><span> self._scc.update_binary('6f30', hplmn + 'ff' * (size-3))</span><br><span> </span><br><span> # EF.SPN (Service Provider Name)</span><br><span>@@ -523,7 +523,7 @@</span><br><span> # get size and write EF.HPLMN</span><br><span> r = self._scc.select_file(['6f30'])</span><br><span> size = int(r[-1][4:8], 16)</span><br><span style="color: hsl(0, 100%, 40%);">- hplmn = enc_plmn(p['mcc'], p['mnc'])</span><br><span style="color: hsl(120, 100%, 40%);">+ hplmn = enc_plmn(int(p['mcc']), int(p['mnc']))</span><br><span> self._scc.update_binary('6f30', hplmn + 'ff' * (size-3))</span><br><span> </span><br><span> # set COMP128 version 0 in proprietary file</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/15496">change 15496</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/+/15496"/><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: Ia2333921a4863f0f26ee923ca796e62ec5e2d59a </div>
<div style="display:none"> Gerrit-Change-Number: 15496 </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>