public/pysim
1
0
Fork 1
mirror of https://gitea.osmocom.org/sim-card/pysim.git synced 2026-03-26 23:38:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix various file definitions

Browse Source 
As we can notice during 'export': Some files had been defined
as LinFixed but are Transparent - and vice versa.  Let's fix those
an bring our definitions in sync with the specs.

Change-Id: I365ece7b82a1c79b3af87a79ff964d7989362789
This commit is contained in:
Harald Welte
2021-04-02 21:33:13 +02:00
parent aae7c2768e
commit 89e5954773
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pySim/ts_31_102.py
View File

@@ -270,7 +270,7 @@ EF_USIM_ADF_map = {
from pySim.filesystem import * from pySim.filesystem import *
from pySim.ts_51_011 import EF_IMSI, EF_xPLMNwAcT, EF_SPN, EF_CBMI, EF_ACC, EF_PLMNsel, EF_AD from pySim.ts_51_011 import EF_IMSI, EF_xPLMNwAcT, EF_SPN, EF_CBMI, EF_ACC, EF_PLMNsel, EF_AD
from pySim.ts_51_011 import EF_CBMID, EF_ECC, EF_CBMIR from pySim.ts_51_011 import EF_CBMID, EF_CBMIR
import pySim.ts_102_221 import pySim.ts_102_221
@@ -460,6 +460,12 @@ class EF_UST(TransparentEF):
"""Deactivate a service within EF.UST""" """Deactivate a service within EF.UST"""
self._cmd.card.update_ust(int(arg), 0) self._cmd.card.update_ust(int(arg), 0)
# TS 31.103 Section 4.2.7 - *not* the same as DF.GSM/EF.ECC!
class EF_ECC(LinFixedEF):
def __init__(self, fid='6fb7', sfid=0x01, name='EF.ECC',
desc='Emergency Call Codes'):
super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len={4,20})
class DF_USIM_5GS(CardDF): class DF_USIM_5GS(CardDF):
def __init__(self, fid='5FC0', name='DF.5GS', desc='5GS related files'): def __init__(self, fid='5FC0', name='DF.5GS', desc='5GS related files'):
super().__init__(fid=fid, name=name, desc=desc) super().__init__(fid=fid, name=name, desc=desc)
@@ -472,7 +478,7 @@ class DF_USIM_5GS(CardDF):
TransparentEF('4F05', None, 'EF.5GAUTHKEYS', '5G authentication keys', size={68, None}), TransparentEF('4F05', None, 'EF.5GAUTHKEYS', '5G authentication keys', size={68, None}),
TransparentEF('4F06', None, 'EF.UAC_AIC', 'UAC Access Identities Configuration', size={4, 4}), TransparentEF('4F06', None, 'EF.UAC_AIC', 'UAC Access Identities Configuration', size={4, 4}),
EF_SUCI_Calc_Info(), #TransparentEF('4F07', None, 'EF.SUCI_Calc_Info', 'SUCI Calculation Information', size={2, None}), EF_SUCI_Calc_Info(), #TransparentEF('4F07', None, 'EF.SUCI_Calc_Info', 'SUCI Calculation Information', size={2, None}),
TransparentEF('4F08', None, 'EF.OPL5G', '5GS Operator PLMN List', size={10, None}), LinFixedEF('4F08', None, 'EF.OPL5G', '5GS Operator PLMN List', rec_len={10, None}),
# TransparentEF('4F09', None, 'EF.NSI', 'Network Specific Identifier'), # FFS # TransparentEF('4F09', None, 'EF.NSI', 'Network Specific Identifier'), # FFS
TransparentEF('4F0A', None, 'EF.Routing_Indicator', 'Routing Indicator', size={4,4}), TransparentEF('4F0A', None, 'EF.Routing_Indicator', 'Routing Indicator', size={4,4}),
] ]
@@ -505,7 +511,7 @@ class ADF_USIM(CardADF):
TransparentEF('6f7e', 0x0b, 'EF.LOCI', 'Locationn information', size={11,11}), TransparentEF('6f7e', 0x0b, 'EF.LOCI', 'Locationn information', size={11,11}),
EF_AD(sfid=0x03), EF_AD(sfid=0x03),
EF_CBMID(sfid=0x0e), EF_CBMID(sfid=0x0e),
EF_ECC(sfid=0x01), EF_ECC(),
EF_CBMIR(), EF_CBMIR(),
DF_USIM_5GS(), DF_USIM_5GS(),
] ]

2
pySim/ts_31_103.py
View File

@@ -124,7 +124,7 @@ class EF_PCSCF(LinFixedEF):
return enc_addr_tlv(json_in) return enc_addr_tlv(json_in)
# TS 31.103 Section 4.2.9 # TS 31.103 Section 4.2.9
class EF_GBABP(LinFixedEF): class EF_GBABP(TransparentEF):
def __init__(self, fid='6fd5', sfid=None, name='EF.GBABP', desc='GBA Bootstrappng'): def __init__(self, fid='6fd5', sfid=None, name='EF.GBABP', desc='GBA Bootstrappng'):
super().__init__(fid=fid, sfid=sfid, name=name, desc=desc) super().__init__(fid=fid, sfid=sfid, name=name, desc=desc)

9
pySim/ts_51_011.py
View File

@@ -484,10 +484,11 @@ class EF_CBMID(EF_CBMI):
desc='Cell Broadcast Message Identifier for Data Download'): desc='Cell Broadcast Message Identifier for Data Download'):
super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len) super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len)
# TS 51.011 Section 10.3.26 # TS 51.011 Section 10.3.27
class EF_ECC(LinFixedEF): class EF_ECC(TransRecEF):
def __init__(self, fid='6fb7', sfid=None, name='EF.ECC', desc='Emergency Call Codes'): def __init__(self, fid='6fb7', sfid=None, name='EF.ECC', size={3,15}, rec_len=3,
super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len={4, 20}) desc='Emergency Call Codes'):
super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len)
# TS 51.011 Section 10.3.28 # TS 51.011 Section 10.3.28
class EF_CBMIR(TransRecEF): class EF_CBMIR(TransRecEF):