catarrh/pysim
1
0
Fork 0
forked from public/pysim
Code Pull Requests Activity

cards: use string representation for MNC/MCC

Browse Source 
At the moment MNC and MCC are represented as integer numbers inside the
parameter array while all other parameters are represented as strings.
Lets use strings for MNC/MCC as well to simplify the parameter handling.
We will also not loose the length information in case of leading zeros.

Change-Id: Ia2333921a4863f0f26ee923ca796e62ec5e2d59a
This commit is contained in:
Philipp Maier
2019-09-12 12:52:43 +02:00
parent 196b08cdfd
commit be069e26ae
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pySim-prog.py
View File

@@ -432,7 +432,7 @@ def print_parameters(params):
if 'smsp' in params: if 'smsp' in params:
s.append(" > SMSP : %(smsp)s") s.append(" > SMSP : %(smsp)s")
s.append(" > ICCID : %(iccid)s") s.append(" > ICCID : %(iccid)s")
s.append(" > MCC/MNC : %(mcc)d/%(mnc)d") s.append(" > MCC/MNC : %(mcc)s/%(mnc)s")
s.append(" > IMSI : %(imsi)s") s.append(" > IMSI : %(imsi)s")
s.append(" > Ki : %(ki)s") s.append(" > Ki : %(ki)s")
s.append(" > OPC : %(opc)s") s.append(" > OPC : %(opc)s")
@@ -483,8 +483,8 @@ def _read_params_csv(opts, iccid=None, imsi=None):
def read_params_csv(opts, imsi=None, iccid=None): def read_params_csv(opts, imsi=None, iccid=None):
row = _read_params_csv(opts, iccid=iccid, imsi=imsi) row = _read_params_csv(opts, iccid=iccid, imsi=imsi)
if row is not None: if row is not None:
row['mcc'] = int(row.get('mcc', row['imsi'][0:3])) row['mcc'] = row.get('mcc', row['imsi'][0:3])
row['mnc'] = int(row.get('mnc', row['imsi'][3:5])) row['mnc'] = row.get('mnc', row['imsi'][3:5])
pin_adm = None pin_adm = None
# We need to escape the pin_adm we get from the csv # We need to escape the pin_adm we get from the csv
if 'pin_adm' in row: if 'pin_adm' in row:

2
pySim/utils.py
View File

@@ -98,7 +98,7 @@ def enc_iccid(iccid):
def enc_plmn(mcc, mnc): def enc_plmn(mcc, mnc):
"""Converts integer MCC/MNC into 3 bytes for EF""" """Converts integer MCC/MNC into 3 bytes for EF"""
return swap_nibbles(lpad('%d' % mcc, 3) + lpad('%d' % mnc, 3)) return swap_nibbles(lpad('%d' % int(mcc), 3) + lpad('%d' % int(mnc), 3))
def dec_spn(ef): def dec_spn(ef):
byte1 = int(ef[0:2]) byte1 = int(ef[0:2])