<p>herlesupreeth <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/18564">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Vadim Yanitskiy: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ts_31_102.py: add EF_ADF_map<br><br>the EF files in the USIM ADF are different to the ones int the GSM dir<br>so added the dictionary to avoid conflicts and hardcoded values<br><br>the 'DIR' one was added in ts_51_011.py, not sure if it should be there<br>as it's not in that standard, but did it for simplicity<br><br>Change-Id: I458380bf46b2986662ecdede2551c22cd9be92ba<br>---<br>M pySim-read.py<br>M pySim/cards.py<br>M pySim/ts_31_102.py<br>M pySim/ts_51_011.py<br>4 files changed, 111 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim-read.py b/pySim-read.py</span><br><span>index e49a907..b23e6ee 100755</span><br><span>--- a/pySim-read.py</span><br><span>+++ b/pySim-read.py</span><br><span>@@ -29,7 +29,7 @@</span><br><span> import re</span><br><span> import sys</span><br><span> from pySim.ts_51_011 import EF, DF, EF_SST_map</span><br><span style="color: hsl(0, 100%, 40%);">-from pySim.ts_31_102 import EF_UST_map</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.ts_31_102 import EF_UST_map, EF_USIM_ADF_map</span><br><span> from pySim.ts_31_103 import EF_IST_map</span><br><span> </span><br><span> from pySim.commands import SimCardCommands</span><br><span>@@ -242,7 +242,7 @@</span><br><span> # EF.UST - File Id in ADF USIM : 6f38</span><br><span> if '9000' == card.select_adf_by_aid():</span><br><span> # EF.UST</span><br><span style="color: hsl(0, 100%, 40%);">- (res, sw) = card.read_binary('6f38')</span><br><span style="color: hsl(120, 100%, 40%);">+ (res, sw) = card.read_binary(EF_USIM_ADF_map['UST'])</span><br><span> if sw == '9000':</span><br><span> print("USIM Service Table: %s" % res)</span><br><span> # Print those which are available</span><br><span>diff --git a/pySim/cards.py b/pySim/cards.py</span><br><span>index c7b34eb..808fde1 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -225,9 +225,9 @@</span><br><span> try:</span><br><span> # Find out how many records the EF.DIR has</span><br><span> # and store all the AIDs in the UICC</span><br><span style="color: hsl(0, 100%, 40%);">- rec_cnt = self._scc.record_count(['3f00', '2f00'])</span><br><span style="color: hsl(120, 100%, 40%);">+ rec_cnt = self._scc.record_count(EF['DIR'])</span><br><span> for i in range(0, rec_cnt):</span><br><span style="color: hsl(0, 100%, 40%);">- rec = self._scc.read_record(['3f00', '2f00'], i + 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ rec = self._scc.read_record(EF['DIR'], i + 1)</span><br><span> if (rec[0][0:2], rec[0][4:6]) == ('61', '4f') and len(rec[0]) > 12 \</span><br><span> and rec[0][8:8 + int(rec[0][6:8], 16) * 2] not in self._aids:</span><br><span> self._aids.append(rec[0][8:8 + int(rec[0][6:8], 16) * 2])</span><br><span>diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py</span><br><span>index 9f5abe9..473e595 100644</span><br><span>--- a/pySim/ts_31_102.py</span><br><span>+++ b/pySim/ts_31_102.py</span><br><span>@@ -135,4 +135,108 @@</span><br><span> 109: 'MCPTT',</span><br><span> 110: 'ePDG configuration Information for Emergency Service support',</span><br><span> 111: 'ePDG configuration Information for Emergency Service configured',</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>\ No newline at end of file</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+EF_USIM_ADF_map = {</span><br><span style="color: hsl(120, 100%, 40%);">+ 'LI': '6F05',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ARR': '6F06',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'IMSI': '6F07',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'Keys': '6F08',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'KeysPS': '6F09',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'DCK': '6F2C',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'HPPLMN': '6F31',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'CNL': '6F32',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ACMmax': '6F37',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'UST': '6F38',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ACM': '6F39',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'FDN': '6F3B',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'SMS': '6F3C',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'GID1': '6F3E',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'GID2': '6F3F',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'MSISDN': '6F40',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'PUCT': '6F41',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'SMSP': '6F42',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'SMSS': '6F42',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'CBMI': '6F45',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'SPN': '6F46',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'SMSR': '6F47',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'CBMID': '6F48',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'SDN': '6F49',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'EXT2': '6F4B',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'EXT3': '6F4C',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'BDN': '6F4D',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'EXT5': '6F4E',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'CCP2': '6F4F',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'CBMIR': '6F50',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'EXT4': '6F55',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'EST': '6F56',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ACL': '6F57',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'CMI': '6F58',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'START-HFN': '6F5B',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'THRESHOLD': '6F5C',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'PLMNwAcT': '6F60',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'OPLMNwAcT': '6F61',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'HPLMNwAcT': '6F62',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'PSLOCI': '6F73',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ACC': '6F78',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'FPLMN': '6F7B',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'LOCI': '6F7E',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ICI': '6F80',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'OCI': '6F81',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ICT': '6F82',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'OCT': '6F83',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'AD': '6FAD',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'VGCS': '6FB1',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'VGCSS': '6FB2',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'VBS': '6FB3',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'VBSS': '6FB4',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'eMLPP': '6FB5',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'AAeM': '6FB6',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ECC': '6FB7',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'Hiddenkey': '6FC3',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'NETPAR': '6FC4',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'PNN': '6FC5',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'OPL': '6FC6',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'MBDN': '6FC7',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'EXT6': '6FC8',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'MBI': '6FC9',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'MWIS': '6FCA',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'CFIS': '6FCB',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'EXT7': '6FCC',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'SPDI': '6FCD',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'MMSN': '6FCE',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'EXT8': '6FCF',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'MMSICP': '6FD0',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'MMSUP': '6FD1',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'MMSUCP': '6FD2',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'NIA': '6FD3',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'VGCSCA': '6FD4',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'VBSCA': '6FD5',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'GBAP': '6FD6',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'MSK': '6FD7',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'MUK': '6FD8',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'EHPLMN': '6FD9',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'GBANL': '6FDA',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'EHPLMNPI': '6FDB',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'LRPLMNSI': '6FDC',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'NAFKCA': '6FDD',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'SPNI': '6FDE',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'PNNI': '6FDF',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'NCP-IP': '6FE2',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'EPSLOCI': '6FE3',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'EPSNSC': '6FE4',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'UFC': '6FE6',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'UICCIARI': '6FE7',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'NASCONFIG': '6FE8',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'PWC': '6FEC',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'FDNURI': '6FED',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'BDNURI': '6FEE',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'SDNURI': '6FEF',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'IWL': '6FF0',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'IPS': '6FF1',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'IPD': '6FF2',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ePDGId': '6FF3',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ePDGSelection': '6FF4',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ePDGIdEm': '6FF5',</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ePDGSelectionEm': '6FF6',</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py</span><br><span>index 1cec91f..37d2bc8 100644</span><br><span>--- a/pySim/ts_51_011.py</span><br><span>+++ b/pySim/ts_51_011.py</span><br><span>@@ -48,6 +48,7 @@</span><br><span> # MF</span><br><span> 'ICCID': '2FE2',</span><br><span> 'ELP': '2F05',</span><br><span style="color: hsl(120, 100%, 40%);">+'DIR': '2F00',</span><br><span> </span><br><span> # DF_TELECOM</span><br><span> 'ADN': '6F3A',</span><br><span>@@ -164,6 +165,7 @@</span><br><span> EF = {</span><br><span> 'ICCID': [MF_num, EF_num['ICCID']],</span><br><span> 'ELP': [MF_num, EF_num['ELP']],</span><br><span style="color: hsl(120, 100%, 40%);">+'DIR': [MF_num, EF_num['DIR']],</span><br><span> </span><br><span> 'ADN': DF['TELECOM']+[EF_num['ADN']],</span><br><span> 'FDN': DF['TELECOM']+[EF_num['FDN']],</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/18564">change 18564</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/+/18564"/><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: I458380bf46b2986662ecdede2551c22cd9be92ba </div>
<div style="display:none"> Gerrit-Change-Number: 18564 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: guilly@gmail.com <guilly@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: guilly@gmail.com <guilly@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: herlesupreeth <herlesupreeth@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>