dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/34335?usp=email ) Change subject: commands: make method verify_binary and verify_record private ...................................................................... commands: make method verify_binary and verify_record private The methods verify_binary and verify_record are only used internally in class SimCardCommands, they can be both private methods. Also lets move them above the method that uses them. Related: OS#5714 Change-Id: I57c9af3d6ff45caa4378c400643b4ae1fa42ecac --- M pySim/commands.py 1 file changed, 42 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/35/34335/1 diff --git a/pySim/commands.py b/pySim/commands.py index ab66392..477cb2b 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -188,6 +188,19 @@ chunk_offset += chunk_len return total_data, sw + def __verify_binary(self, ef, data: str, offset: int = 0): + """Verify contents of transparent EF. + + Args: + ef : string or list of strings indicating name or path of transparent EF + data : hex string of expected data + offset : byte offset in file from which to start verifying + """ + res = self.read_binary(ef, len(data) // 2, offset) + if res[0].lower() != data.lower(): + raise ValueError('Binary verification failed (expected %s, got %s)' % ( + data.lower(), res[0].lower())) + def update_binary(self, ef: Path, data: Hexstr, offset: int = 0, verify: bool = False, conserve: bool = False) -> ResTuple: """Execute UPDATE BINARY. @@ -227,22 +240,9 @@ total_data += data chunk_offset += chunk_len if verify: - self.verify_binary(ef, data, offset) + self.__verify_binary(ef, data, offset) return total_data, chunk_sw - def verify_binary(self, ef, data: str, offset: int = 0): - """Verify contents of transparent EF. - - Args: - ef : string or list of strings indicating name or path of transparent EF - data : hex string of expected data - offset : byte offset in file from which to start verifying - """ - res = self.read_binary(ef, len(data) // 2, offset) - if res[0].lower() != data.lower(): - raise ValueError('Binary verification failed (expected %s, got %s)' % ( - data.lower(), res[0].lower())) - def read_record(self, ef: Path, rec_no: int) -> ResTuple: """Execute READ RECORD. @@ -255,6 +255,19 @@ pdu = self.cla_byte + 'b2%02x04%02x' % (rec_no, rec_length) return self._tp.send_apdu_checksw(pdu) + def __verify_record(self, ef: Path, rec_no: int, data: str): + """Verify record against given data + + Args: + ef : string or list of strings indicating name or path of linear fixed EF + rec_no : record number to read + data : hex string of data to be verified + """ + res = self.read_record(ef, rec_no) + if res[0].lower() != data.lower(): + raise ValueError('Record verification failed (expected %s, got %s)' % ( + data.lower(), res[0].lower())) + def update_record(self, ef: Path, rec_no: int, data: Hexstr, force_len: bool = False, verify: bool = False, conserve: bool = False) -> ResTuple: """Execute UPDATE RECORD. @@ -294,22 +307,9 @@ pdu = (self.cla_byte + 'dc%02x04%02x' % (rec_no, rec_length)) + data res = self._tp.send_apdu_checksw(pdu) if verify: - self.verify_record(ef, rec_no, data) + self.__verify_record(ef, rec_no, data) return res - def verify_record(self, ef: Path, rec_no: int, data: str): - """Verify record against given data - - Args: - ef : string or list of strings indicating name or path of linear fixed EF - rec_no : record number to read - data : hex string of data to be verified - """ - res = self.read_record(ef, rec_no) - if res[0].lower() != data.lower(): - raise ValueError('Record verification failed (expected %s, got %s)' % ( - data.lower(), res[0].lower())) - def record_size(self, ef: Path) -> int: """Determine the record size of given file. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34335?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I57c9af3d6ff45caa4378c400643b4ae1fa42ecac Gerrit-Change-Number: 34335 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange