<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/26276">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">profile: decode_select_response can be a static method<br><br>The method decode_select_response does not access any property of the<br>object. This means the method can be static.<br><br>Change-Id: Idd7aaebcf1ab0099cd40a88b8938604e84d8a88b<br>---<br>M pySim/profile.py<br>M pySim/sysmocom_sja2.py<br>M pySim/ts_102_221.py<br>M pySim/ts_31_102.py<br>M pySim/ts_31_103.py<br>M pySim/ts_51_011.py<br>6 files changed, 27 insertions(+), 29 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim/profile.py b/pySim/profile.py</span><br><span>index f068d7c..768064f 100644</span><br><span>--- a/pySim/profile.py</span><br><span>+++ b/pySim/profile.py</span><br><span>@@ -106,7 +106,8 @@</span><br><span> """</span><br><span> return interpret_sw(self.sw, sw)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def decode_select_response(self, data_hex:str) -> Any:</span><br><span style="color: hsl(120, 100%, 40%);">+ @staticmethod</span><br><span style="color: hsl(120, 100%, 40%);">+ def decode_select_response(data_hex:str) -> Any:</span><br><span> """Decode the response to a SELECT command.</span><br><span> </span><br><span> This is the fall-back method which doesn't perform any decoding. It mostly</span><br><span>diff --git a/pySim/sysmocom_sja2.py b/pySim/sysmocom_sja2.py</span><br><span>index 263999d..6d49572 100644</span><br><span>--- a/pySim/sysmocom_sja2.py</span><br><span>+++ b/pySim/sysmocom_sja2.py</span><br><span>@@ -154,7 +154,7 @@</span><br><span> self.add_files(files)</span><br><span> </span><br><span> def decode_select_response(self, resp_hex):</span><br><span style="color: hsl(0, 100%, 40%);">- return pySim.ts_102_221.decode_select_response(resp_hex)</span><br><span style="color: hsl(120, 100%, 40%);">+ return pySim.ts_102_221.CardProfileUICC.decode_select_response(resp_hex)</span><br><span> </span><br><span> class EF_USIM_SQN(TransparentEF):</span><br><span> def __init__(self, fid='af30', name='EF.USIM_SQN'):</span><br><span>diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py</span><br><span>index 53cd118..1d10988 100644</span><br><span>--- a/pySim/ts_102_221.py</span><br><span>+++ b/pySim/ts_102_221.py</span><br><span>@@ -473,28 +473,6 @@</span><br><span> SC_DO = DataObjectChoice('security_condition', 'Security Condition',</span><br><span> members=[Always_DO, Never_DO, SecCondByte_DO(), SecCondByte_DO(0x9e), CRT_DO()])</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-# ETSI TS 102 221 Section 11.1.1.3</span><br><span style="color: hsl(0, 100%, 40%);">-def decode_select_response(resp_hex):</span><br><span style="color: hsl(0, 100%, 40%);">- fixup_fcp_proprietary_tlv_map(FCP_Proprietary_TLV_MAP)</span><br><span style="color: hsl(0, 100%, 40%);">- resp_hex = resp_hex.upper()</span><br><span style="color: hsl(0, 100%, 40%);">- # outer layer</span><br><span style="color: hsl(0, 100%, 40%);">- fcp_base_tlv = TLV(['62'])</span><br><span style="color: hsl(0, 100%, 40%);">- fcp_base = fcp_base_tlv.parse(resp_hex)</span><br><span style="color: hsl(0, 100%, 40%);">- # actual FCP</span><br><span style="color: hsl(0, 100%, 40%);">- fcp_tlv = TLV(FCP_TLV_MAP)</span><br><span style="color: hsl(0, 100%, 40%);">- fcp = fcp_tlv.parse(fcp_base['62'])</span><br><span style="color: hsl(0, 100%, 40%);">- # further decode the proprietary information</span><br><span style="color: hsl(0, 100%, 40%);">- if fcp['A5']:</span><br><span style="color: hsl(0, 100%, 40%);">- prop_tlv = TLV(FCP_Proprietary_TLV_MAP)</span><br><span style="color: hsl(0, 100%, 40%);">- prop = prop_tlv.parse(fcp['A5'])</span><br><span style="color: hsl(0, 100%, 40%);">- fcp['A5'] = tlv_val_interpret(FCP_prorietary_interpreter_map, prop)</span><br><span style="color: hsl(0, 100%, 40%);">- fcp['A5'] = tlv_key_replace(FCP_Proprietary_TLV_MAP, fcp['A5'])</span><br><span style="color: hsl(0, 100%, 40%);">- # finally make sure we get human-readable keys in the output dict</span><br><span style="color: hsl(0, 100%, 40%);">- r = tlv_val_interpret(FCP_interpreter_map, fcp)</span><br><span style="color: hsl(0, 100%, 40%);">- return tlv_key_replace(FCP_TLV_MAP, r)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> # TS 102 221 Section 13.1</span><br><span> class EF_DIR(LinFixedEF):</span><br><span> def __init__(self, fid='2f00', sfid=0x1e, name='EF.DIR', desc='Application Directory'):</span><br><span>@@ -694,8 +672,26 @@</span><br><span> </span><br><span> super().__init__(name, desc='ETSI TS 102 221', cla="00", sel_ctrl="0004", files_in_mf=files, sw=sw)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def decode_select_response(self, data_hex:str) -> Any:</span><br><span style="color: hsl(0, 100%, 40%);">- return decode_select_response(data_hex)</span><br><span style="color: hsl(120, 100%, 40%);">+ @staticmethod</span><br><span style="color: hsl(120, 100%, 40%);">+ def decode_select_response(resp_hex:str) -> Any:</span><br><span style="color: hsl(120, 100%, 40%);">+ """ETSI TS 102 221 Section 11.1.1.3"""</span><br><span style="color: hsl(120, 100%, 40%);">+ fixup_fcp_proprietary_tlv_map(FCP_Proprietary_TLV_MAP)</span><br><span style="color: hsl(120, 100%, 40%);">+ resp_hex = resp_hex.upper()</span><br><span style="color: hsl(120, 100%, 40%);">+ # outer layer</span><br><span style="color: hsl(120, 100%, 40%);">+ fcp_base_tlv = TLV(['62'])</span><br><span style="color: hsl(120, 100%, 40%);">+ fcp_base = fcp_base_tlv.parse(resp_hex)</span><br><span style="color: hsl(120, 100%, 40%);">+ # actual FCP</span><br><span style="color: hsl(120, 100%, 40%);">+ fcp_tlv = TLV(FCP_TLV_MAP)</span><br><span style="color: hsl(120, 100%, 40%);">+ fcp = fcp_tlv.parse(fcp_base['62'])</span><br><span style="color: hsl(120, 100%, 40%);">+ # further decode the proprietary information</span><br><span style="color: hsl(120, 100%, 40%);">+ if fcp['A5']:</span><br><span style="color: hsl(120, 100%, 40%);">+ prop_tlv = TLV(FCP_Proprietary_TLV_MAP)</span><br><span style="color: hsl(120, 100%, 40%);">+ prop = prop_tlv.parse(fcp['A5'])</span><br><span style="color: hsl(120, 100%, 40%);">+ fcp['A5'] = tlv_val_interpret(FCP_prorietary_interpreter_map, prop)</span><br><span style="color: hsl(120, 100%, 40%);">+ fcp['A5'] = tlv_key_replace(FCP_Proprietary_TLV_MAP, fcp['A5'])</span><br><span style="color: hsl(120, 100%, 40%);">+ # finally make sure we get human-readable keys in the output dict</span><br><span style="color: hsl(120, 100%, 40%);">+ r = tlv_val_interpret(FCP_interpreter_map, fcp)</span><br><span style="color: hsl(120, 100%, 40%);">+ return tlv_key_replace(FCP_TLV_MAP, r)</span><br><span> </span><br><span> @staticmethod</span><br><span> def match_with_card(scc:SimCardCommands) -> bool:</span><br><span>diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py</span><br><span>index 14d7ec1..647a4d7 100644</span><br><span>--- a/pySim/ts_31_102.py</span><br><span>+++ b/pySim/ts_31_102.py</span><br><span>@@ -1067,7 +1067,7 @@</span><br><span> self.add_files(files)</span><br><span> </span><br><span> def decode_select_response(self, data_hex):</span><br><span style="color: hsl(0, 100%, 40%);">- return pySim.ts_102_221.decode_select_response(data_hex)</span><br><span style="color: hsl(120, 100%, 40%);">+ return pySim.ts_102_221.CardProfileUICC.decode_select_response(data_hex)</span><br><span> </span><br><span> @with_default_category('Application-Specific Commands')</span><br><span> class AddlShellCommands(CommandSet):</span><br><span>diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py</span><br><span>index 63ef99e..9c7843f 100644</span><br><span>--- a/pySim/ts_31_103.py</span><br><span>+++ b/pySim/ts_31_103.py</span><br><span>@@ -213,7 +213,7 @@</span><br><span> self.shell_commands += [ADF_USIM.AddlShellCommands()]</span><br><span> </span><br><span> def decode_select_response(self, data_hex):</span><br><span style="color: hsl(0, 100%, 40%);">- return pySim.ts_102_221.decode_select_response(data_hex)</span><br><span style="color: hsl(120, 100%, 40%);">+ return pySim.ts_102_221.CardProfileUICC.decode_select_response(data_hex)</span><br><span> </span><br><span> # TS 31.103 Section 7.1</span><br><span> sw_isim = {</span><br><span>diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py</span><br><span>index 2d3ad0c..f330460 100644</span><br><span>--- a/pySim/ts_51_011.py</span><br><span>+++ b/pySim/ts_51_011.py</span><br><span>@@ -978,7 +978,8 @@</span><br><span> </span><br><span> super().__init__('SIM', desc='GSM SIM Card', cla="a0", sel_ctrl="0000", files_in_mf=[DF_TELECOM(), DF_GSM()], sw=sw)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def decode_select_response(self, resp_hex:str) -> Any:</span><br><span style="color: hsl(120, 100%, 40%);">+ @staticmethod</span><br><span style="color: hsl(120, 100%, 40%);">+ def decode_select_response(resp_hex:str) -> Any:</span><br><span> resp_bin = h2b(resp_hex)</span><br><span> struct_of_file_map = {</span><br><span> 0: 'transparent',</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/26276">change 26276</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/pysim/+/26276"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: pysim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Idd7aaebcf1ab0099cd40a88b8938604e84d8a88b </div>
<div style="display:none"> Gerrit-Change-Number: 26276 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>