This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
laforge gerrit-no-reply at lists.osmocom.orglaforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/pysim/+/15505 )
Change subject: python3 conversion: fix tabs and spaces inconsistency
......................................................................
python3 conversion: fix tabs and spaces inconsistency
Without that fix we have:
$ python3 pySim-read.py
File "pySim-read.py", line 135
try:
^
TabError: inconsistent use of tabs and spaces in indentation
The following command was used to do the conversion:
sed 's# #\t#g' -i $(find -name "*.py")
Then the remaining spaces spotted during the review were
addressed manually.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo at cyberdimension.org>
Change-Id: I83f76a8e9b6e36098f16552a0135a8c22dde545f
---
M pySim-prog.py
M pySim-read.py
M pySim/cards.py
M pySim/commands.py
M pySim/transport/__init__.py
5 files changed, 108 insertions(+), 109 deletions(-)
Approvals:
Jenkins Builder: Verified
neels: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/pySim-prog.py b/pySim-prog.py
index 990fe15..b070c5e 100755
--- a/pySim-prog.py
+++ b/pySim-prog.py
@@ -130,7 +130,7 @@
)
parser.add_option("--acc", dest="acc",
help="Set ACC bits (Access Control Code). not all card types are supported",
- )
+ )
parser.add_option("--read-imsi", dest="read_imsi", action="store_true",
help="Read the IMSI from the CARD", default=False
)
@@ -176,8 +176,8 @@
print kls.name
sys.exit(0)
- if options.probe:
- return options
+ if options.probe:
+ return options
if options.source == 'csv':
if (options.imsi is None) and (options.batch_mode is False) and (options.read_imsi is False) and (options.read_iccid is False):
@@ -287,7 +287,7 @@
iccid = (
'89' + # Common prefix (telecom)
cc_digits + # Country Code on 2/3 digits
- plmn_digits # MCC/MNC on 5/6 digits
+ plmn_digits # MCC/MNC on 5/6 digits
)
ml = 18 - len(iccid)
@@ -399,14 +399,14 @@
else:
raise ValueError("PIN-ADM needs to be <=8 digits (ascii)")
- if opts.pin_adm_hex is not None:
+ if opts.pin_adm_hex is not None:
if len(opts.pin_adm_hex) == 16:
pin_adm = opts.pin_adm_hex
# Ensure that it's hex-encoded
try:
try_encode = h2b(pin_adm)
except ValueError:
- raise ValueError("PIN-ADM needs to be hex encoded using this option")
+ raise ValueError("PIN-ADM needs to be hex encoded using this option")
else:
raise ValueError("PIN-ADM needs to be exactly 16 digits (hex encoded)")
@@ -462,8 +462,8 @@
cr.fieldnames = [ field.lower() for field in cr.fieldnames ]
i = 0
- if not 'iccid' in cr.fieldnames:
- raise Exception("CSV file in wrong format!")
+ if not 'iccid' in cr.fieldnames:
+ raise Exception("CSV file in wrong format!")
for row in cr:
if opts.num is not None and opts.read_iccid is False and opts.read_imsi is False:
if opts.num == i:
@@ -726,7 +726,7 @@
if opts.card_handler:
card_handler = card_handler_auto(sl, opts.card_handler)
- else:
+ else:
card_handler = card_handler(sl)
# Iterate
@@ -762,4 +762,3 @@
sys.exit(rc)
first = False
-
diff --git a/pySim-read.py b/pySim-read.py
index 17fce61..4bfa900 100755
--- a/pySim-read.py
+++ b/pySim-read.py
@@ -123,41 +123,41 @@
# EF.PLMNsel
try:
- (res, sw) = scc.read_binary(EF['PLMNsel'])
- if sw == '9000':
- print("PLMNsel: %s" % (res))
- else:
- print("PLMNsel: Can't read, response code = %s" % (sw,))
+ (res, sw) = scc.read_binary(EF['PLMNsel'])
+ if sw == '9000':
+ print("PLMNsel: %s" % (res))
+ else:
+ print("PLMNsel: Can't read, response code = %s" % (sw,))
except Exception as e:
print "HPLMNAcT: Can't read file -- " + str(e)
# EF.PLMNwAcT
- try:
- (res, sw) = scc.read_binary(EF['PLMNwAcT'])
- if sw == '9000':
- print("PLMNwAcT:\n%s" % (format_xplmn_w_act(res)))
- else:
- print("PLMNwAcT: Can't read, response code = %s" % (sw,))
+ try:
+ (res, sw) = scc.read_binary(EF['PLMNwAcT'])
+ if sw == '9000':
+ print("PLMNwAcT:\n%s" % (format_xplmn_w_act(res)))
+ else:
+ print("PLMNwAcT: Can't read, response code = %s" % (sw,))
except Exception as e:
print "PLMNwAcT: Can't read file -- " + str(e)
# EF.OPLMNwAcT
- try:
- (res, sw) = scc.read_binary(EF['OPLMNwAcT'])
- if sw == '9000':
- print("OPLMNwAcT:\n%s" % (format_xplmn_w_act(res)))
- else:
- print("OPLMNwAcT: Can't read, response code = %s" % (sw,))
+ try:
+ (res, sw) = scc.read_binary(EF['OPLMNwAcT'])
+ if sw == '9000':
+ print("OPLMNwAcT:\n%s" % (format_xplmn_w_act(res)))
+ else:
+ print("OPLMNwAcT: Can't read, response code = %s" % (sw,))
except Exception as e:
print "OPLMNwAcT: Can't read file -- " + str(e)
# EF.HPLMNAcT
- try:
- (res, sw) = scc.read_binary(EF['HPLMNAcT'])
- if sw == '9000':
- print("HPLMNAcT:\n%s" % (format_xplmn_w_act(res)))
- else:
- print("HPLMNAcT: Can't read, response code = %s" % (sw,))
+ try:
+ (res, sw) = scc.read_binary(EF['HPLMNAcT'])
+ if sw == '9000':
+ print("HPLMNAcT:\n%s" % (format_xplmn_w_act(res)))
+ else:
+ print("HPLMNAcT: Can't read, response code = %s" % (sw,))
except Exception as e:
print "HPLMNAcT: Can't read file -- " + str(e)
diff --git a/pySim/cards.py b/pySim/cards.py
index cda337a..41723c4 100644
--- a/pySim/cards.py
+++ b/pySim/cards.py
@@ -85,11 +85,11 @@
def update_oplmn_act(self, mcc, mnc, access_tech='FFFF'):
"""
- See note in update_hplmn_act()
+ See note in update_hplmn_act()
"""
# get size and write EF.OPLMNwAcT
- data = self._scc.read_binary(EF['OPLMNwAcT'], length=None, offset=0)
- size = len(data[0])/2
+ data = self._scc.read_binary(EF['OPLMNwAcT'], length=None, offset=0)
+ size = len(data[0])/2
hplmn = enc_plmn(mcc, mnc)
content = hplmn + access_tech
data, sw = self._scc.update_binary(EF['OPLMNwAcT'], content + 'ffffff0000' * (size/5-1))
@@ -97,19 +97,19 @@
def update_plmn_act(self, mcc, mnc, access_tech='FFFF'):
"""
- See note in update_hplmn_act()
+ See note in update_hplmn_act()
"""
# get size and write EF.PLMNwAcT
- data = self._scc.read_binary(EF['PLMNwAcT'], length=None, offset=0)
- size = len(data[0])/2
+ data = self._scc.read_binary(EF['PLMNwAcT'], length=None, offset=0)
+ size = len(data[0])/2
hplmn = enc_plmn(mcc, mnc)
content = hplmn + access_tech
data, sw = self._scc.update_binary(EF['PLMNwAcT'], content + 'ffffff0000' * (size/5-1))
return sw
- def update_plmnsel(self, mcc, mnc):
- data = self._scc.read_binary(EF['PLMNsel'], length=None, offset=0)
- size = len(data[0])/2
+ def update_plmnsel(self, mcc, mnc):
+ data = self._scc.read_binary(EF['PLMNsel'], length=None, offset=0)
+ size = len(data[0])/2
hplmn = enc_plmn(mcc, mnc)
data, sw = self._scc.update_binary(EF['PLMNsel'], hplmn + 'ff' * (size-3))
return sw
@@ -119,16 +119,16 @@
return sw
def update_ad(self, mnc):
- #See also: 3GPP TS 31.102, chapter 4.2.18
- mnclen = len(str(mnc))
- if mnclen == 1:
- mnclen = 2
- if mnclen > 3:
+ #See also: 3GPP TS 31.102, chapter 4.2.18
+ mnclen = len(str(mnc))
+ if mnclen == 1:
+ mnclen = 2
+ if mnclen > 3:
raise RuntimeError('unable to calculate proper mnclen')
- data = self._scc.read_binary(EF['AD'], length=None, offset=0)
- size = len(data[0])/2
- content = data[0][0:6] + "%02X" % mnclen
+ data = self._scc.read_binary(EF['AD'], length=None, offset=0)
+ size = len(data[0])/2
+ content = data[0][0:6] + "%02X" % mnclen
data, sw = self._scc.update_binary(EF['AD'], content)
return sw
@@ -394,7 +394,7 @@
data, sw = self._scc.update_binary('6f78', lpad(p['acc'], 4))
# EF.SMSP
- if p.get('smsp'):
+ if p.get('smsp'):
r = self._scc.select_file(['3f00', '7f10', '6f42'])
data, sw = self._scc.update_record('6f42', 1, lpad(p['smsp'], 80))
@@ -426,7 +426,7 @@
"""
name = 'sysmosim-gr1'
- @classmethod
+ @classmethod
def autodetect(kls, scc):
try:
# Look for ATR
@@ -536,7 +536,7 @@
r = self._scc.select_file(['3f00', '7f10'])
# write EF.SMSP
- if p.get('smsp'):
+ if p.get('smsp'):
data, sw = self._scc.update_record('6f42', 1, lpad(p['smsp'], 80))
def erase(self):
@@ -592,25 +592,25 @@
data, sw = self._scc.update_binary('6f07', enc_imsi(p['imsi']))
# EF.PLMNsel
- if p.get('mcc') and p.get('mnc'):
- sw = self.update_plmnsel(p['mcc'], p['mnc'])
- if sw != '9000':
+ if p.get('mcc') and p.get('mnc'):
+ sw = self.update_plmnsel(p['mcc'], p['mnc'])
+ if sw != '9000':
print("Programming PLMNsel failed with code %s"%sw)
- # EF.PLMNwAcT
- if p.get('mcc') and p.get('mnc'):
+ # EF.PLMNwAcT
+ if p.get('mcc') and p.get('mnc'):
sw = self.update_plmn_act(p['mcc'], p['mnc'])
if sw != '9000':
print("Programming PLMNwAcT failed with code %s"%sw)
- # EF.OPLMNwAcT
- if p.get('mcc') and p.get('mnc'):
+ # EF.OPLMNwAcT
+ if p.get('mcc') and p.get('mnc'):
sw = self.update_oplmn_act(p['mcc'], p['mnc'])
if sw != '9000':
print("Programming OPLMNwAcT failed with code %s"%sw)
- # EF.AD
- if p.get('mcc') and p.get('mnc'):
+ # EF.AD
+ if p.get('mcc') and p.get('mnc'):
sw = self.update_ad(p['mnc'])
if sw != '9000':
print("Programming AD failed with code %s"%sw)
@@ -848,28 +848,28 @@
if sw != '9000':
raise RuntimeError('Failed to authenticate with ADM key %s'%(p['pin_adm'],))
- # EF.ICCID
- # TODO: Add programming of the ICCID
- if p.get('iccid'):
+ # EF.ICCID
+ # TODO: Add programming of the ICCID
+ if p.get('iccid'):
print("Warning: Programming of the ICCID is not implemented for this type of card.")
- # KI (Presumably a propritary file)
- # TODO: Add programming of KI
- if p.get('ki'):
+ # KI (Presumably a propritary file)
+ # TODO: Add programming of KI
+ if p.get('ki'):
print("Warning: Programming of the KI is not implemented for this type of card.")
- # OPc (Presumably a propritary file)
- # TODO: Add programming of OPc
- if p.get('opc'):
+ # OPc (Presumably a propritary file)
+ # TODO: Add programming of OPc
+ if p.get('opc'):
print("Warning: Programming of the OPc is not implemented for this type of card.")
- # EF.SMSP
+ # EF.SMSP
if p.get('smsp'):
sw = self.update_smsp(p['smsp'])
if sw != '9000':
print("Programming SMSP failed with code %s"%sw)
- # EF.IMSI
+ # EF.IMSI
if p.get('imsi'):
sw = self.update_imsi(p['imsi'])
if sw != '9000':
@@ -882,30 +882,30 @@
print("Programming ACC failed with code %s"%sw)
# EF.PLMNsel
- if p.get('mcc') and p.get('mnc'):
- sw = self.update_plmnsel(p['mcc'], p['mnc'])
- if sw != '9000':
+ if p.get('mcc') and p.get('mnc'):
+ sw = self.update_plmnsel(p['mcc'], p['mnc'])
+ if sw != '9000':
print("Programming PLMNsel failed with code %s"%sw)
- # EF.PLMNwAcT
- if p.get('mcc') and p.get('mnc'):
+ # EF.PLMNwAcT
+ if p.get('mcc') and p.get('mnc'):
sw = self.update_plmn_act(p['mcc'], p['mnc'])
if sw != '9000':
print("Programming PLMNwAcT failed with code %s"%sw)
- # EF.OPLMNwAcT
- if p.get('mcc') and p.get('mnc'):
+ # EF.OPLMNwAcT
+ if p.get('mcc') and p.get('mnc'):
sw = self.update_oplmn_act(p['mcc'], p['mnc'])
if sw != '9000':
print("Programming OPLMNwAcT failed with code %s"%sw)
- # EF.AD
- if p.get('mcc') and p.get('mnc'):
+ # EF.AD
+ if p.get('mcc') and p.get('mnc'):
sw = self.update_ad(p['mnc'])
if sw != '9000':
print("Programming AD failed with code %s"%sw)
- return None
+ return None
def erase(self):
return
diff --git a/pySim/commands.py b/pySim/commands.py
index 3d17903..03540b6 100644
--- a/pySim/commands.py
+++ b/pySim/commands.py
@@ -34,7 +34,7 @@
def __get_len_from_tlv(self, fcp):
# see also: ETSI TS 102 221, chapter 11.1.1.3.1 Response for MF,
# DF or ADF
- from pytlv.TLV import TLV
+ from pytlv.TLV import TLV
tlvparser = TLV(['82', '83', '84', 'a5', '8a', '8b', '8c', '80', 'ab', 'c6', '81', '88'])
# pytlv is case sensitive!
@@ -62,24 +62,24 @@
return int(tlv_parsed['80'], 16)
- # Tell the length of a record by the card response
- # USIMs respond with an FCP template, which is different
- # from what SIMs responds. See also:
- # USIM: ETSI TS 102 221, chapter 11.1.1.3 Response Data
- # SIM: GSM 11.11, chapter 9.2.1 SELECT
+ # Tell the length of a record by the card response
+ # USIMs respond with an FCP template, which is different
+ # from what SIMs responds. See also:
+ # USIM: ETSI TS 102 221, chapter 11.1.1.3 Response Data
+ # SIM: GSM 11.11, chapter 9.2.1 SELECT
def __record_len(self, r):
- if self.sel_ctrl == "0004":
- return self.__get_len_from_tlv(r[-1])
- else:
- return int(r[-1][28:30], 16)
+ if self.sel_ctrl == "0004":
+ return self.__get_len_from_tlv(r[-1])
+ else:
+ return int(r[-1][28:30], 16)
- # Tell the length of a binary file. See also comment
- # above.
+ # Tell the length of a binary file. See also comment
+ # above.
def __len(self, r):
- if self.sel_ctrl == "0004":
- return self.__get_len_from_tlv(r[-1])
- else:
- return int(r[-1][4:8], 16)
+ if self.sel_ctrl == "0004":
+ return self.__get_len_from_tlv(r[-1])
+ else:
+ return int(r[-1][4:8], 16)
def get_atr(self):
return self._tp.get_atr()
diff --git a/pySim/transport/__init__.py b/pySim/transport/__init__.py
index 4b932cd..69e2fe9 100644
--- a/pySim/transport/__init__.py
+++ b/pySim/transport/__init__.py
@@ -28,7 +28,7 @@
timeout : Maximum wait time (None=no timeout)
newcardonly : Should we wait for a new card, or an already
- inserted one ?
+ inserted one ?
"""
pass
@@ -52,8 +52,8 @@
pdu : string of hexadecimal characters (ex. "A0A40000023F00")
return : tuple(data, sw), where
- data : string (in hex) of returned data (ex. "074F4EFFFF")
- sw : string (in hex) of status word (ex. "9000")
+ data : string (in hex) of returned data (ex. "074F4EFFFF")
+ sw : string (in hex) of status word (ex. "9000")
"""
pass
@@ -62,8 +62,8 @@
pdu : string of hexadecimal characters (ex. "A0A40000023F00")
return : tuple(data, sw), where
- data : string (in hex) of returned data (ex. "074F4EFFFF")
- sw : string (in hex) of status word (ex. "9000")
+ data : string (in hex) of returned data (ex. "074F4EFFFF")
+ sw : string (in hex) of status word (ex. "9000")
"""
data, sw = self.send_apdu_raw(pdu)
@@ -84,15 +84,15 @@
pdu : string of hexadecimal characters (ex. "A0A40000023F00")
sw : string of 4 hexadecimal characters (ex. "9000"). The
- user may mask out certain digits using a '?' to add some
- ambiguity if needed.
+ user may mask out certain digits using a '?' to add some
+ ambiguity if needed.
return : tuple(data, sw), where
- data : string (in hex) of returned data (ex. "074F4EFFFF")
- sw : string (in hex) of status word (ex. "9000")
+ data : string (in hex) of returned data (ex. "074F4EFFFF")
+ sw : string (in hex) of status word (ex. "9000")
"""
rv = self.send_apdu(pdu)
- # Create a masked version of the returned status word
+ # Create a masked version of the returned status word
sw_masked = ""
for i in range(0, 4):
if sw.lower()[i] == '?':
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/15505
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I83f76a8e9b6e36098f16552a0135a8c22dde545f
Gerrit-Change-Number: 15505
Gerrit-PatchSet: 2
Gerrit-Owner: gnutoo <GNUtoo at cyberdimension.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190928/c235db46/attachment.htm>