laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/37419?usp=email )

Change subject: pySim.saip.oid: Properly differentiate optional from non-optional templates ......................................................................

pySim.saip.oid: Properly differentiate optional from non-optional templates

There are e.g. templates for usim and for opt-usim, and they should not be confused with each other. Let's reflect that in the naming.

Change-Id: Ic6d04ce3172dc969c6b8c018b8d305eb6fd3f550 --- M pySim/esim/saip/__init__.py M pySim/esim/saip/oid.py M pySim/esim/saip/templates.py 3 files changed, 26 insertions(+), 14 deletions(-)

Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved

diff --git a/pySim/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 2cddbe8..6e17de3 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -54,14 +54,14 @@ aid = h2b("") mandatory_services = ["csim"] pe_types = ["csim", "opt-csim", "cdmaParameter"] - templates = [oid.ADF_CSIM_by_default, oid.ADF_CSIM_not_by_default] + templates = [oid.ADF_CSIM_by_default, oid.ADF_CSIMopt_not_by_default]

class NaaUsim(Naa): name = "usim" aid = h2b("") mandatory_services = ["usim"] pe_types = ["usim", "opt-usim"] - templates = [oid.ADF_USIM_by_default, oid.ADF_USIM_not_by_default, + templates = [oid.ADF_USIM_by_default, oid.ADF_USIMopt_not_by_default, oid.DF_PHONEBOOK_ADF_USIM, oid.DF_GSM_ACCESS_ADF_USIM, oid.DF_EAP, oid.DF_5GS, oid.DF_SAIP, oid.DF_SNPN, oid.DF_5GProSe] @@ -71,7 +71,7 @@ aid = h2b("") mandatory_services = ["isim"] pe_types = ["isim", "opt-isim"] - templates = [oid.ADF_ISIM_by_default, oid.ADF_ISIM_not_by_default] + templates = [oid.ADF_ISIM_by_default, oid.ADF_ISIMopt_not_by_default]

NAAs = { NaaCsim.name: NaaCsim, diff --git a/pySim/esim/saip/oid.py b/pySim/esim/saip/oid.py index d33b786..91a48c1 100644 --- a/pySim/esim/saip/oid.py +++ b/pySim/esim/saip/oid.py @@ -57,18 +57,18 @@ DF_TELECOM_v2 = eOID("2.3.2") ADF_USIM_by_default = eOID("2.4") ADF_USIM_by_default_v2 = eOID("2.4.2") -ADF_USIM_not_by_default = eOID("2.5") -ADF_USIM_not_by_default_v2 = eOID("2.5.2") -ADF_USIM_not_by_default_v3 = eOID("2.5.3") +ADF_USIMopt_not_by_default = eOID("2.5") +ADF_USIMopt_not_by_default_v2 = eOID("2.5.2") +ADF_USIMopt_not_by_default_v3 = eOID("2.5.3") DF_PHONEBOOK_ADF_USIM = eOID("2.6") DF_GSM_ACCESS_ADF_USIM = eOID("2.7") ADF_ISIM_by_default = eOID("2.8") -ADF_ISIM_not_by_default = eOID("2.9") -ADF_ISIM_not_by_default_v2 = eOID("2.9.2") +ADF_ISIMopt_not_by_default = eOID("2.9") +ADF_ISIMopt_not_by_default_v2 = eOID("2.9.2") ADF_CSIM_by_default = eOID("2.10") ADF_CSIM_by_default_v2 = eOID("2.10.2") -ADF_CSIM_not_by_default = eOID("2.11") -ADF_CSIM_not_by_default_v2 = eOID("2.11.2") +ADF_CSIMopt_not_by_default = eOID("2.11") +ADF_CSIMopt_not_by_default_v2 = eOID("2.11.2") DF_EAP = eOID("2.12") DF_5GS = eOID("2.13") DF_5GS_v2 = eOID("2.13.2") diff --git a/pySim/esim/saip/templates.py b/pySim/esim/saip/templates.py index cd76247..417c83b 100644 --- a/pySim/esim/saip/templates.py +++ b/pySim/esim/saip/templates.py @@ -318,7 +318,7 @@ # Section 9.5.2 v2.3.1 class FilesUsimOptional(ProfileTemplate): created_by_default = False - oid = OID.ADF_USIM_not_by_default + oid = OID.ADF_USIMopt_not_by_default files = [ FileTemplate(0x6f05, 'EF.LI', 'TR', None, 6, 1, 0x02, 'FF...FF', False), FileTemplate(0x6f37, 'EF.ACMmax', 'TR', None, 3, 5, None, '000000', False, ass_serv=[13], pe_name='ef-acmax'), @@ -400,7 +400,7 @@ # Section 9.5.2 class FilesUsimOptionalV2(ProfileTemplate): created_by_default = False - oid = OID.ADF_USIM_not_by_default_v2 + oid = OID.ADF_USIMopt_not_by_default_v2 files = [ FileTemplate(0x6f05, 'EF.LI', 'TR', None, 6, 1, 0x02, 'FF...FF', False), FileTemplate(0x6f37, 'EF.ACMmax', 'TR', None, 3, 5, None, '000000', False, ass_serv=[13]), @@ -601,7 +601,7 @@ # Section 9.6.2 v2.3.1 class FilesIsimOptional(ProfileTemplate): created_by_default = False - oid = OID.ADF_ISIM_not_by_default + oid = OID.ADF_ISIMopt_not_by_default files = [ FileTemplate(0x6f09, 'EF.P-CSCF', 'LF', 1, None, 2, None, None, True, ['size'], ass_serv=[1,5]), FileTemplate(0x6f3c, 'EF.SMS', 'LF', 10, 176, 5, None, '00FF...FF', False, ass_serv=[6,8]), @@ -618,7 +618,7 @@ # Section 9.6.2 class FilesIsimOptionalv2(ProfileTemplate): created_by_default = False - oid = OID.ADF_ISIM_not_by_default_v2 + oid = OID.ADF_ISIMopt_not_by_default_v2 files = [ FileTemplate(0x6f09, 'EF.PCSCF', 'LF', 1, None, 2, None, None, True, ['size'], ass_serv=[1,5]), FileTemplate(0x6f3c, 'EF.SMS', 'LF', 10, 176, 5, None, '00FF...FF', False, ass_serv=[6,8]),