<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/23584">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix various file definitions<br><br>As we can notice during 'export': Some files had been defined<br>as LinFixed but are Transparent - and vice versa. Let's fix those<br>an bring our definitions in sync with the specs.<br><br>Change-Id: I365ece7b82a1c79b3af87a79ff964d7989362789<br>---<br>M pySim/ts_31_102.py<br>M pySim/ts_31_103.py<br>M pySim/ts_51_011.py<br>3 files changed, 15 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/84/23584/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py</span><br><span>index cefc9d4..267008d 100644</span><br><span>--- a/pySim/ts_31_102.py</span><br><span>+++ b/pySim/ts_31_102.py</span><br><span>@@ -270,7 +270,7 @@</span><br><span> </span><br><span> from pySim.filesystem import *</span><br><span> from pySim.ts_51_011 import EF_IMSI, EF_xPLMNwAcT, EF_SPN, EF_CBMI, EF_ACC, EF_PLMNsel, EF_AD</span><br><span style="color: hsl(0, 100%, 40%);">-from pySim.ts_51_011 import EF_CBMID, EF_ECC, EF_CBMIR</span><br><span style="color: hsl(120, 100%, 40%);">+from pySim.ts_51_011 import EF_CBMID, EF_CBMIR</span><br><span> </span><br><span> import pySim.ts_102_221</span><br><span> </span><br><span>@@ -460,6 +460,12 @@</span><br><span> """Deactivate a service within EF.UST"""</span><br><span> self._cmd.card.update_ust(int(arg), 0)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# TS 31.103 Section 4.2.7 - *not* the same as DF.GSM/EF.ECC!</span><br><span style="color: hsl(120, 100%, 40%);">+class EF_ECC(LinFixedEF):</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, fid='6fb7', sfid=0x01, name='EF.ECC',</span><br><span style="color: hsl(120, 100%, 40%);">+ desc='Emergency Call Codes'):</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len={4,20})</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> class DF_USIM_5GS(CardDF):</span><br><span> def __init__(self, fid='5FC0', name='DF.5GS', desc='5GS related files'):</span><br><span> super().__init__(fid=fid, name=name, desc=desc)</span><br><span>@@ -472,7 +478,7 @@</span><br><span> TransparentEF('4F05', None, 'EF.5GAUTHKEYS', '5G authentication keys', size={68, None}),</span><br><span> TransparentEF('4F06', None, 'EF.UAC_AIC', 'UAC Access Identities Configuration', size={4, 4}),</span><br><span> EF_SUCI_Calc_Info(), #TransparentEF('4F07', None, 'EF.SUCI_Calc_Info', 'SUCI Calculation Information', size={2, None}),</span><br><span style="color: hsl(0, 100%, 40%);">- TransparentEF('4F08', None, 'EF.OPL5G', '5GS Operator PLMN List', size={10, None}),</span><br><span style="color: hsl(120, 100%, 40%);">+ LinFixedEF('4F08', None, 'EF.OPL5G', '5GS Operator PLMN List', rec_len={10, None}),</span><br><span> # TransparentEF('4F09', None, 'EF.NSI', 'Network Specific Identifier'), # FFS</span><br><span> TransparentEF('4F0A', None, 'EF.Routing_Indicator', 'Routing Indicator', size={4,4}),</span><br><span> ]</span><br><span>@@ -505,7 +511,7 @@</span><br><span> TransparentEF('6f7e', 0x0b, 'EF.LOCI', 'Locationn information', size={11,11}),</span><br><span> EF_AD(sfid=0x03),</span><br><span> EF_CBMID(sfid=0x0e),</span><br><span style="color: hsl(0, 100%, 40%);">- EF_ECC(sfid=0x01),</span><br><span style="color: hsl(120, 100%, 40%);">+ EF_ECC(),</span><br><span> EF_CBMIR(),</span><br><span> DF_USIM_5GS(),</span><br><span> ]</span><br><span>diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py</span><br><span>index 0b0a4f1..8209845 100644</span><br><span>--- a/pySim/ts_31_103.py</span><br><span>+++ b/pySim/ts_31_103.py</span><br><span>@@ -124,7 +124,7 @@</span><br><span> return enc_addr_tlv(json_in)</span><br><span> </span><br><span> # TS 31.103 Section 4.2.9</span><br><span style="color: hsl(0, 100%, 40%);">-class EF_GBABP(LinFixedEF):</span><br><span style="color: hsl(120, 100%, 40%);">+class EF_GBABP(TransparentEF):</span><br><span> def __init__(self, fid='6fd5', sfid=None, name='EF.GBABP', desc='GBA Bootstrappng'):</span><br><span> super().__init__(fid=fid, sfid=sfid, name=name, desc=desc)</span><br><span> </span><br><span>diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py</span><br><span>index e4a26a3..1455d8f 100644</span><br><span>--- a/pySim/ts_51_011.py</span><br><span>+++ b/pySim/ts_51_011.py</span><br><span>@@ -484,10 +484,11 @@</span><br><span> desc='Cell Broadcast Message Identifier for Data Download'):</span><br><span> super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# TS 51.011 Section 10.3.26</span><br><span style="color: hsl(0, 100%, 40%);">-class EF_ECC(LinFixedEF):</span><br><span style="color: hsl(0, 100%, 40%);">- def __init__(self, fid='6fb7', sfid=None, name='EF.ECC', desc='Emergency Call Codes'):</span><br><span style="color: hsl(0, 100%, 40%);">- super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len={4, 20})</span><br><span style="color: hsl(120, 100%, 40%);">+# TS 51.011 Section 10.3.27</span><br><span style="color: hsl(120, 100%, 40%);">+class EF_ECC(TransRecEF):</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, fid='6fb7', sfid=None, name='EF.ECC', size={3,15}, rec_len=3,</span><br><span style="color: hsl(120, 100%, 40%);">+ desc='Emergency Call Codes'):</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len)</span><br><span> </span><br><span> # TS 51.011 Section 10.3.28</span><br><span> class EF_CBMIR(TransRecEF):</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/23584">change 23584</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/+/23584"/><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: I365ece7b82a1c79b3af87a79ff964d7989362789 </div>
<div style="display:none"> Gerrit-Change-Number: 23584 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>