<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/15313">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pySim-prog: Use CSV format with headers<br><br>This way we can have optional fields like adm1 in the file<br>Also require iccid as identifier for the SIM card<br><br>Change-Id: I0d317ea51d0cf582b82157eec6cdec074001a236<br>---<br>M pySim-prog.py<br>M pySim/cards.py<br>2 files changed, 22 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/13/15313/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 2638eef..dde9194 100755</span><br><span>--- a/pySim-prog.py</span><br><span>+++ b/pySim-prog.py</span><br><span>@@ -399,7 +399,7 @@</span><br><span> 'ki' : ki,</span><br><span> 'opc' : opc,</span><br><span> 'acc' : acc,</span><br><span style="color: hsl(0, 100%, 40%);">- 'pin_adm' : pin_adm,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'adm1' : pin_adm,</span><br><span> }</span><br><span> </span><br><span> </span><br><span>@@ -414,6 +414,7 @@</span><br><span> > Ki : %(ki)s</span><br><span> > OPC : %(opc)s</span><br><span> > ACC : %(acc)s</span><br><span style="color: hsl(120, 100%, 40%);">+ > ADM1 : %(adm1)s</span><br><span> """ % params</span><br><span> </span><br><span> </span><br><span>@@ -427,18 +428,23 @@</span><br><span> cw.writerow([params[x] for x in row])</span><br><span> f.close()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-def _read_params_csv(opts, imsi):</span><br><span style="color: hsl(120, 100%, 40%);">+def _read_params_csv(opts, iccid=None, imsi=None):</span><br><span> import csv</span><br><span style="color: hsl(0, 100%, 40%);">- row = ['name', 'iccid', 'mcc', 'mnc', 'imsi', 'smsp', 'ki', 'opc']</span><br><span> f = open(opts.read_csv, 'r')</span><br><span style="color: hsl(0, 100%, 40%);">- cr = csv.DictReader(f, row)</span><br><span style="color: hsl(120, 100%, 40%);">+ cr = csv.DictReader(f)</span><br><span> i = 0</span><br><span style="color: hsl(120, 100%, 40%);">+ if not 'iccid' in cr.fieldnames:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise Exception("CSV file in wrong format!")</span><br><span> for row in cr:</span><br><span> if opts.num is not None and opts.read_imsi is False:</span><br><span> if opts.num == i:</span><br><span> f.close()</span><br><span> return row;</span><br><span> i += 1</span><br><span style="color: hsl(120, 100%, 40%);">+ if row['iccid'] == iccid:</span><br><span style="color: hsl(120, 100%, 40%);">+ f.close()</span><br><span style="color: hsl(120, 100%, 40%);">+ return row;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if row['imsi'] == imsi:</span><br><span> f.close()</span><br><span> return row;</span><br><span>@@ -446,8 +452,8 @@</span><br><span> f.close()</span><br><span> return None</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-def read_params_csv(opts, imsi):</span><br><span style="color: hsl(0, 100%, 40%);">- row = _read_params_csv(opts, imsi)</span><br><span style="color: hsl(120, 100%, 40%);">+def read_params_csv(opts, imsi=None, iccid=None):</span><br><span style="color: hsl(120, 100%, 40%);">+ row = _read_params_csv(opts, iccid=iccid, imsi=imsi)</span><br><span> if row is not None:</span><br><span> row['mcc'] = int(row['mcc'])</span><br><span> row['mnc'] = int(row['mnc'])</span><br><span>@@ -628,7 +634,9 @@</span><br><span> if opts.source == 'cmdline':</span><br><span> cp = gen_parameters(opts)</span><br><span> elif opts.source == 'csv':</span><br><span style="color: hsl(0, 100%, 40%);">- if opts.read_imsi:</span><br><span style="color: hsl(120, 100%, 40%);">+ imsi = None</span><br><span style="color: hsl(120, 100%, 40%);">+ iccid = None</span><br><span style="color: hsl(120, 100%, 40%);">+ if opts.read_imsi:</span><br><span> if opts.dry_run:</span><br><span> # Connect transport</span><br><span> print "Insert card now (or CTRL-C to cancel)"</span><br><span>@@ -637,7 +645,7 @@</span><br><span> imsi = swap_nibbles(res)[3:]</span><br><span> else:</span><br><span> imsi = opts.imsi</span><br><span style="color: hsl(0, 100%, 40%);">- cp = read_params_csv(opts, imsi)</span><br><span style="color: hsl(120, 100%, 40%);">+ cp = read_params_csv(opts, imsi=imsi, iccid=iccid)</span><br><span> if cp is None:</span><br><span> print "Error reading parameters\n"</span><br><span> sys.exit(2)</span><br><span>diff --git a/pySim/cards.py b/pySim/cards.py</span><br><span>index 55282aa..a850e5a 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -375,8 +375,8 @@</span><br><span> #self._scc.verify_chv(4, h2b("4444444444444444"))</span><br><span> </span><br><span> # Authenticate using ADM PIN 5</span><br><span style="color: hsl(0, 100%, 40%);">- if p['pin_adm']:</span><br><span style="color: hsl(0, 100%, 40%);">- pin = h2b(p['pin_adm'])</span><br><span style="color: hsl(120, 100%, 40%);">+ if p['adm1']:</span><br><span style="color: hsl(120, 100%, 40%);">+ pin = h2b(p['adm1'])</span><br><span> else:</span><br><span> pin = h2b("4444444444444444")</span><br><span> self._scc.verify_chv(5, pin)</span><br><span>@@ -495,8 +495,8 @@</span><br><span> # P1: 3A for PIN, 3B for PUK</span><br><span> # P2: CHV number, as in VERIFY CHV for PIN, and as in UNBLOCK CHV for PUK</span><br><span> # P3: 08, CHV length (curiously the PUK is also 08 length, instead of 10)</span><br><span style="color: hsl(0, 100%, 40%);">- if p['pin_adm']:</span><br><span style="color: hsl(0, 100%, 40%);">- pin = p['pin_adm']</span><br><span style="color: hsl(120, 100%, 40%);">+ if p['adm1']:</span><br><span style="color: hsl(120, 100%, 40%);">+ pin = p['adm1']</span><br><span> else:</span><br><span> pin = h2b("4444444444444444")</span><br><span> </span><br><span>@@ -567,9 +567,9 @@</span><br><span> def program(self, p):</span><br><span> </span><br><span> # authenticate as ADM using default key (written on the card..)</span><br><span style="color: hsl(0, 100%, 40%);">- if not p['pin_adm']:</span><br><span style="color: hsl(120, 100%, 40%);">+ if not p['adm1']:</span><br><span> raise ValueError("Please provide a PIN-ADM as there is no default one")</span><br><span style="color: hsl(0, 100%, 40%);">- self._scc.verify_chv(0x0A, h2b(p['pin_adm']))</span><br><span style="color: hsl(120, 100%, 40%);">+ self._scc.verify_chv(0x0A, p['adm1'])</span><br><span> </span><br><span> # select MF</span><br><span> r = self._scc.select_file(['3f00'])</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/15313">change 15313</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/+/15313"/><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: I0d317ea51d0cf582b82157eec6cdec074001a236 </div>
<div style="display:none"> Gerrit-Change-Number: 15313 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>