diff options
author | Philipp Maier <pmaier@sysmocom.de> | 2021-11-11 11:53:49 +0100 |
---|---|---|
committer | Philipp Maier <pmaier@sysmocom.de> | 2021-11-19 13:21:32 +0100 |
commit | 4ab971c62e68bb707d050a6fe4348f614f1a4d23 (patch) | |
tree | 485973f90bfec9053957d5ffffa7896467667396 /pySim | |
parent | a028c7d7aaa30c7c8da6987f9c19d17b3d1a2ddb (diff) |
ts_51_011: move _decode_select_response into profile class
The method decode_select_response just calls the function
_decode_select_response. But the function _decode_select_response
is not called from any other location, so we can move it into the
profile class.
Change-Id: Icf0143f64ca7d1c1ebf60ba06585f7afc1ac0d11
Diffstat (limited to 'pySim')
-rw-r--r-- | pySim/ts_51_011.py | 82 |
1 files changed, 38 insertions, 44 deletions
diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 393277b..2d3ad0c 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -934,48 +934,6 @@ class DF_GSM(CardDF): ] self.add_files(files) - - -def _decode_select_response(resp_hex): - - resp_bin = h2b(resp_hex) - struct_of_file_map = { - 0: 'transparent', - 1: 'linear_fixed', - 3: 'cyclic' - } - type_of_file_map = { - 1: 'mf', - 2: 'df', - 4: 'working_ef' - } - ret = { - 'file_descriptor': {}, - 'proprietary_info': {}, - } - ret['file_id'] = b2h(resp_bin[4:6]) - ret['proprietary_info']['available_memory'] = int.from_bytes(resp_bin[2:4], 'big') - file_type = type_of_file_map[resp_bin[6]] if resp_bin[6] in type_of_file_map else resp_bin[6] - ret['file_descriptor']['file_type'] = file_type - if file_type in ['mf', 'df']: - ret['file_characteristics'] = b2h(resp_bin[13:14]) - ret['num_direct_child_df'] = resp_bin[14] - ret['num_direct_child_ef'] = resp_bin[15] - ret['num_chv_unblock_adm_codes'] = int(resp_bin[16]) - # CHV / UNBLOCK CHV stats - elif file_type in ['working_ef']: - file_struct = struct_of_file_map[resp_bin[13]] if resp_bin[13] in struct_of_file_map else resp_bin[13] - ret['file_descriptor']['structure'] = file_struct - ret['access_conditions'] = b2h(resp_bin[8:10]) - if resp_bin[11] & 0x01 == 0: - ret['life_cycle_status_int'] = 'operational_activated' - elif resp_bin[11] & 0x04: - ret['life_cycle_status_int'] = 'operational_deactivated' - else: - ret['life_cycle_status_int'] = 'terminated' - - return ret - class CardProfileSIM(CardProfile): ORDER = 2 @@ -1019,8 +977,44 @@ class CardProfileSIM(CardProfile): } super().__init__('SIM', desc='GSM SIM Card', cla="a0", sel_ctrl="0000", files_in_mf=[DF_TELECOM(), DF_GSM()], sw=sw) - def decode_select_response(self, data_hex:str) -> Any: - return _decode_select_response(data_hex) + + def decode_select_response(self, resp_hex:str) -> Any: + resp_bin = h2b(resp_hex) + struct_of_file_map = { + 0: 'transparent', + 1: 'linear_fixed', + 3: 'cyclic' + } + type_of_file_map = { + 1: 'mf', + 2: 'df', + 4: 'working_ef' + } + ret = { + 'file_descriptor': {}, + 'proprietary_info': {}, + } + ret['file_id'] = b2h(resp_bin[4:6]) + ret['proprietary_info']['available_memory'] = int.from_bytes(resp_bin[2:4], 'big') + file_type = type_of_file_map[resp_bin[6]] if resp_bin[6] in type_of_file_map else resp_bin[6] + ret['file_descriptor']['file_type'] = file_type + if file_type in ['mf', 'df']: + ret['file_characteristics'] = b2h(resp_bin[13:14]) + ret['num_direct_child_df'] = resp_bin[14] + ret['num_direct_child_ef'] = resp_bin[15] + ret['num_chv_unblock_adm_codes'] = int(resp_bin[16]) + # CHV / UNBLOCK CHV stats + elif file_type in ['working_ef']: + file_struct = struct_of_file_map[resp_bin[13]] if resp_bin[13] in struct_of_file_map else resp_bin[13] + ret['file_descriptor']['structure'] = file_struct + ret['access_conditions'] = b2h(resp_bin[8:10]) + if resp_bin[11] & 0x01 == 0: + ret['life_cycle_status_int'] = 'operational_activated' + elif resp_bin[11] & 0x04: + ret['life_cycle_status_int'] = 'operational_deactivated' + else: + ret['life_cycle_status_int'] = 'terminated' + return ret @staticmethod def match_with_card(scc:SimCardCommands) -> bool: |