<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/15394">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
dexter: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add an option to read the iccid and batch-program the new card data<br><br>This can be used to reprogram everything including IMSI on the card:<br><br>while true; do<br> ./pySim-prog.py -p 0 -t sysmoUSIM-SJS1 --source=csv --read-csv=cards.csv --read-iccid &&<br> paplay complete.oga<br> sleep 2<br>done<br><br>Change-Id: Ib343a29141b5255f67a59ab76959b51e162b7916<br>---<br>M pySim-prog.py<br>1 file changed, 26 insertions(+), 9 deletions(-)<br><br></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 2ac4dad..8abce0a 100755</span><br><span>--- a/pySim-prog.py</span><br><span>+++ b/pySim-prog.py</span><br><span>@@ -39,7 +39,7 @@</span><br><span> </span><br><span> from pySim.commands import SimCardCommands</span><br><span> from pySim.cards import _cards_classes</span><br><span style="color: hsl(0, 100%, 40%);">-from pySim.utils import h2b, swap_nibbles, rpad, derive_milenage_opc, calculate_luhn</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.utils import h2b, swap_nibbles, rpad, derive_milenage_opc, calculate_luhn, dec_iccid</span><br><span> from pySim.ts_51_011 import EF</span><br><span> </span><br><span> def parse_options():</span><br><span>@@ -131,6 +131,9 @@</span><br><span> parser.add_option("--read-imsi", dest="read_imsi", action="store_true",</span><br><span> help="Read the IMSI from the CARD", default=False</span><br><span> )</span><br><span style="color: hsl(120, 100%, 40%);">+ parser.add_option("--read-iccid", dest="read_iccid", action="store_true",</span><br><span style="color: hsl(120, 100%, 40%);">+ help="Read the ICCID from the CARD", default=False</span><br><span style="color: hsl(120, 100%, 40%);">+ )</span><br><span> parser.add_option("-z", "--secret", dest="secret", metavar="STR",</span><br><span> help="Secret used for ICCID/IMSI autogen",</span><br><span> )</span><br><span>@@ -171,8 +174,8 @@</span><br><span> return options</span><br><span> </span><br><span> if options.source == 'csv':</span><br><span style="color: hsl(0, 100%, 40%);">- if (options.imsi is None) and (options.batch_mode is False) and (options.read_imsi is False):</span><br><span style="color: hsl(0, 100%, 40%);">- parser.error("CSV mode needs either an IMSI, --read-imsi or batch mode")</span><br><span style="color: hsl(120, 100%, 40%);">+ if (options.imsi is None) and (options.batch_mode is False) and (options.read_imsi is False) and (options.read_iccid is False):</span><br><span style="color: hsl(120, 100%, 40%);">+ parser.error("CSV mode needs either an IMSI, --read-imsi, --read-iccid or batch mode")</span><br><span> if options.read_csv is None:</span><br><span> parser.error("CSV mode requires a CSV input file")</span><br><span> elif options.source == 'cmdline':</span><br><span>@@ -444,7 +447,7 @@</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> f = open(opts.read_csv, 'r')</span><br><span> cr = csv.DictReader(f)</span><br><span>@@ -452,11 +455,15 @@</span><br><span> if not 'iccid' in cr.fieldnames:</span><br><span> raise Exception("CSV file in wrong format!")</span><br><span> for row in cr:</span><br><span style="color: hsl(0, 100%, 40%);">- if opts.num is not None and opts.read_imsi is False:</span><br><span style="color: hsl(120, 100%, 40%);">+ if opts.num is not None and opts.read_iccid is False 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>@@ -464,8 +471,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.get('mcc', row['imsi'][0:3]))</span><br><span> row['mnc'] = int(row.get('mnc', row['imsi'][3:5]))</span><br><span>@@ -655,7 +662,17 @@</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_iccid:</span><br><span style="color: hsl(120, 100%, 40%);">+ if opts.dry_run:</span><br><span style="color: hsl(120, 100%, 40%);">+ # Connect transport</span><br><span style="color: hsl(120, 100%, 40%);">+ print "Insert card now (or CTRL-C to cancel)"</span><br><span style="color: hsl(120, 100%, 40%);">+ sl.wait_for_card(newcardonly=not first)</span><br><span style="color: hsl(120, 100%, 40%);">+ (res,_) = scc.read_binary(['3f00', '2fe2'], length=10)</span><br><span style="color: hsl(120, 100%, 40%);">+ iccid = dec_iccid(res)</span><br><span style="color: hsl(120, 100%, 40%);">+ print iccid</span><br><span style="color: hsl(120, 100%, 40%);">+ elif 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>@@ -664,7 +681,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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/15394">change 15394</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/+/15394"/><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: Ib343a29141b5255f67a59ab76959b51e162b7916 </div>
<div style="display:none"> Gerrit-Change-Number: 15394 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>