Change in pysim[master]: ts_31_102: Add support for DF.GSM-ACCESS

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28635 ) Change subject: ts_31_102: Add support for DF.GSM-ACCESS ...................................................................... ts_31_102: Add support for DF.GSM-ACCESS Change-Id: I244c3eea13587e6213062d9a58e821697614a86a --- M pySim/ts_31_102.py M pySim/ts_51_011.py 2 files changed, 25 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/35/28635/1 diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 786bd64..a4f3532 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -33,6 +33,7 @@ from pySim.ts_51_011 import EF_SMSR, EF_DCK, EF_EXT, EF_CNL, EF_OPL, EF_MBI, EF_MWIS from pySim.ts_51_011 import EF_CBMID, EF_CBMIR, EF_ADN, EF_SMS, EF_MSISDN, EF_SMSP, EF_SMSS from pySim.ts_51_011 import EF_IMSI, EF_xPLMNwAcT, EF_SPN, EF_CBMI, EF_ACC, EF_PLMNsel +from pySim.ts_51_011 import EF_Kc, EF_CPBCCH, EF_InvScan from pySim.ts_102_221 import EF_ARR from pySim.tlv import * from pySim.filesystem import * @@ -920,6 +921,23 @@ super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._construct = BitStruct('rfu'/BitsRFU(7), 'from_preferred'/Bit) + +###################################################################### +# DF.GSM-ACCESS +###################################################################### + +class DF_GSM_ACCESS(CardDF): + def __init__(self, fid='5F3B', name='DF.GSM-ACCESS', desc='GSM Access', **kwargs): + super().__init__(fid=fid, name=name, desc=desc, service=27, **kwargs) + files = [ + EF_Kc(fid='4f20', sfid=0x01, service=27), + EF_Kc(fid='4f52', sfid=0x02, name='EF.KcGPRS', desc='GPRS Ciphering key KcGPRS', service=27), + EF_CPBCCH(fid='4f63', service=39), + EF_InvScan(fid='4f64', service=40), + ] + self.add_files(files) + + ###################################################################### # DF.5GS ###################################################################### @@ -1196,7 +1214,7 @@ EF_FromPreferred(service=114), # FIXME: DF_SoLSA service=23 DF_PHONEBOOK(), - # FIXME: DF_GSM_ACCESS service=27 + DF_GSM_ACCESS(), DF_WLAN(service=[59, 60, 61, 62, 63, 66, 81, 82, 83, 84, 88]), DF_HNB(service=[86, 90]), DF_ProSe(service=101), diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 0a481e1..0927c9f 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -798,8 +798,8 @@ # TS 51.011 Section 10.3.32 class EF_Kc(TransparentEF): - def __init__(self, fid='6f20', sfid=None, name='EF.Kc', desc='Ciphering key Kc', size={9, 9}): - super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) + def __init__(self, fid='6f20', sfid=None, name='EF.Kc', desc='Ciphering key Kc', size={9, 9}, **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._construct = Struct('kc'/HexAdapter(Bytes(8)), 'cksn'/Int8ub) # TS 51.011 Section 10.3.33 @@ -862,15 +862,15 @@ # TS 51.011 Section 10.3.38 class EF_CPBCCH(TransRecEF): def __init__(self, fid='6f63', sfid=None, name='EF.CPBCCH', size={2, 14}, rec_len=2, - desc='CPBCCH Information'): - super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len) + desc='CPBCCH Information', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) self._construct = Struct('cpbcch'/Int16ub) # TS 51.011 Section 10.3.39 class EF_InvScan(TransparentEF): def __init__(self, fid='6f64', sfid=None, name='EF.InvScan', size={1, 1}, - desc='IOnvestigation Scan'): - super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) + desc='IOnvestigation Scan', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) self._construct = FlagsEnum( Byte, in_limited_service_mode=1, after_successful_plmn_selection=2) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I244c3eea13587e6213062d9a58e821697614a86a Gerrit-Change-Number: 28635 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange