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

commands: Python 3 fix: properly distinguish str and list

Browse Source 
Unlike Python 2, in Python 3 strings also have attribute '__iter__'.
Because of that, a string could be passed to select_file(), that
actually expects a list as the first parameter.

P.S. Madness, Python 3 is just a new different language...
P.P.S. They should have renamed it not to confuse people.

Change-Id: I92af47abb6adff0271c55e7f278e8c5188f2be75
Fixes: OS#4419
This commit is contained in:
Vadim Yanitskiy
2020-02-27 01:40:14 +07:00
parent fa617ac20d
commit edf873d04a
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pySim/commands.py
View File

@@ -102,6 +102,8 @@ class SimCardCommands(object):
def select_file(self, dir_list): def select_file(self, dir_list):
rv = [] rv = []
if type(dir_list) is not list:
dir_list = [dir_list]
for i in dir_list: for i in dir_list:
data, sw = self._tp.send_apdu_checksw(self.cla_byte + "a4" + self.sel_ctrl + "02" + i) data, sw = self._tp.send_apdu_checksw(self.cla_byte + "a4" + self.sel_ctrl + "02" + i)
rv.append(data) rv.append(data)
@@ -112,8 +114,6 @@ class SimCardCommands(object):
return self._tp.send_apdu_checksw(self.cla_byte + "a4" + "0404" + aidlen + aid) return self._tp.send_apdu_checksw(self.cla_byte + "a4" + "0404" + aidlen + aid)
def read_binary(self, ef, length=None, offset=0): def read_binary(self, ef, length=None, offset=0):
if not hasattr(type(ef), '__iter__'):
ef = [ef]
r = self.select_file(ef) r = self.select_file(ef)
if len(r[-1]) == 0: if len(r[-1]) == 0:
return (None, None) return (None, None)
@@ -123,23 +123,17 @@ class SimCardCommands(object):
return self._tp.send_apdu(pdu) return self._tp.send_apdu(pdu)
def update_binary(self, ef, data, offset=0): def update_binary(self, ef, data, offset=0):
if not hasattr(type(ef), '__iter__'):
ef = [ef]
self.select_file(ef) self.select_file(ef)
pdu = self.cla_byte + 'd6%04x%02x' % (offset, len(data) // 2) + data pdu = self.cla_byte + 'd6%04x%02x' % (offset, len(data) // 2) + data
return self._tp.send_apdu_checksw(pdu) return self._tp.send_apdu_checksw(pdu)
def read_record(self, ef, rec_no): def read_record(self, ef, rec_no):
if not hasattr(type(ef), '__iter__'):
ef = [ef]
r = self.select_file(ef) r = self.select_file(ef)
rec_length = self.__record_len(r) rec_length = self.__record_len(r)
pdu = self.cla_byte + 'b2%02x04%02x' % (rec_no, rec_length) pdu = self.cla_byte + 'b2%02x04%02x' % (rec_no, rec_length)
return self._tp.send_apdu(pdu) return self._tp.send_apdu(pdu)
def update_record(self, ef, rec_no, data, force_len=False): def update_record(self, ef, rec_no, data, force_len=False):
if not hasattr(type(ef), '__iter__'):
ef = [ef]
r = self.select_file(ef) r = self.select_file(ef)
if not force_len: if not force_len:
rec_length = self.__record_len(r) rec_length = self.__record_len(r)