add SUCI parameters

Change-Id: I3c0793b8a67bbd0c8247784bd3b5cbd265f94ec2
This commit is contained in:
Neels Hofmeyr
2026-04-25 05:23:24 +02:00
parent d28cf0a05e
commit 181c85d012
3 changed files with 397 additions and 3 deletions

View File

@@ -21,6 +21,7 @@ import io
import sys
import unittest
import io
import json
from importlib import resources
from osmocom.utils import hexstr
from pySim.esim.saip import ProfileElementSequence
@@ -60,11 +61,14 @@ class ConfigurableParameterTest(unittest.TestCase):
)
class Paramtest:
def __init__(self, param_cls, val, expect_val, expect_clean_val=None, iff_present=False):
iff_present_default = False
def __init__(self, param_cls, val, expect_val, expect_clean_val=None, iff_present=None):
self.param_cls = param_cls
self.val = val
self.expect_clean_val = expect_clean_val
self.expect_val = expect_val
if iff_present is None:
iff_present = Paramtest.iff_present_default
self.iff_present = iff_present
param_tests = [
@@ -277,8 +281,56 @@ class ConfigurableParameterTest(unittest.TestCase):
val=3,
expect_clean_val=3,
expect_val='3'),
]
]
Paramtest.iff_present_default = True
sucici = {
"prot_scheme_id_list": [
{"priority": 0, "identifier": 2, "key_index": 1},
{"priority": 1, "identifier": 1, "key_index": 2},
],
"hnet_pubkey_list": [
{"hnet_pubkey_identifier": 27,
"hnet_pubkey": "0472da71976234ce833a6907425867b82e074d44ef907dfb4b3e21c1c2256ebcd15a7ded52fcbb097a4ed250e036c7b9c8c7004c4eedc4f068cd7bf8d3f900e3b4"},
{"hnet_pubkey_identifier": 30,
"hnet_pubkey": "5a8d38864820197c3394b92613b20b91633cbd897119273bf8e4a6f4eec0a650"},
],
}
param_tests.extend([
Paramtest(param_cls=p13n.SuciActive, val='SUCI-on',
expect_clean_val=True,
expect_val={'5G-SUCI-active': 'SUCI-on'}),
Paramtest(param_cls=p13n.SuciActive, val='SUCI-off',
expect_clean_val=False,
expect_val={'5G-SUCI-active': 'SUCI-off'}),
Paramtest(param_cls=p13n.SuciInUsim, val='SUCI-in-UE',
expect_clean_val=False,
expect_val={'5G-SUCI-in-USIM': 'SUCI-in-UE'}),
Paramtest(param_cls=p13n.SuciInUsim, val='SUCI-in-USIM',
expect_clean_val=True,
expect_val={'5G-SUCI-in-USIM': 'SUCI-in-USIM'}),
Paramtest(param_cls=p13n.SuciRi, val='123',
expect_clean_val='123',
expect_val={'5G-SUCI-RI': '123'}),
Paramtest(param_cls=p13n.SuciRi, val='0',
expect_clean_val='0',
expect_val={'5G-SUCI-RI': '0'}),
Paramtest(param_cls=p13n.SuciRi, val='9999',
expect_clean_val='9999',
expect_val={'5G-SUCI-RI': '9999'}),
Paramtest(param_cls=p13n.SuciCalcInfo,
val=json.dumps(sucici),
expect_clean_val=sucici,
expect_val={'5G-SUCI-CalcInfo': json.dumps(sucici)}),
])
Paramtest.iff_present_default = False
for sdkey_cls in (
# thin out the number of tests, as a compromise between completeness and test runtime

View File

@@ -214,6 +214,46 @@ ok: TS48v5_SAIP2.1A_NoBERTLV.der MncLen(val=3:int)
previous value: ['2']
read_back_val={'MNC-LEN': '3'}:{str}
ok: TS48v5_SAIP2.1A_NoBERTLV.der SuciActive(val='SUCI-on':str)
clean_val=True:bool
previous value: ['SUCI-on']
read_back_val={'5G-SUCI-active': 'SUCI-on'}:{str}
ok: TS48v5_SAIP2.1A_NoBERTLV.der SuciActive(val='SUCI-off':str)
clean_val=False:bool
previous value: ['SUCI-on']
read_back_val={'5G-SUCI-active': 'SUCI-off'}:{str}
ok: TS48v5_SAIP2.1A_NoBERTLV.der SuciInUsim(val='SUCI-in-UE':str)
clean_val=False:bool
previous value: ['SUCI-in-UE']
read_back_val={'5G-SUCI-in-USIM': 'SUCI-in-UE'}:{str}
ok: TS48v5_SAIP2.1A_NoBERTLV.der SuciInUsim(val='SUCI-in-USIM':str)
clean_val=True:bool
previous value: ['SUCI-in-UE']
read_back_val={'5G-SUCI-in-USIM': 'SUCI-in-USIM'}:{str}
skip: TS48v5_SAIP2.1A_NoBERTLV.der SuciRi(val='123':str)
clean_val='123':str
previous value: []
skipping, param not in template.
skip: TS48v5_SAIP2.1A_NoBERTLV.der SuciRi(val='0':str)
clean_val='0':str
previous value: []
skipping, param not in template.
skip: TS48v5_SAIP2.1A_NoBERTLV.der SuciRi(val='9999':str)
clean_val='9999':str
previous value: []
skipping, param not in template.
skip: TS48v5_SAIP2.1A_NoBERTLV.der SuciCalcInfo(val='{"prot_scheme_id_list": [{"priority": 0, "identifier": 2, "key_index": 1}, {"priority": 1, "identifier": 1, "key_index": 2}], "hnet_pubkey_list": [{"hnet_pubkey_identifier": 27, "hnet_pubkey": "0472da71976234ce833a6907425867b82e074d44ef907dfb4b3e21c1c2256ebcd15a7ded52fcbb097a4ed250e036c7b9c8c7004c4eedc4f068cd7bf8d3f900e3b4"}, {"hnet_pubkey_identifier": 30, "hnet_pubkey": "5a8d38864820197c3394b92613b20b91633cbd897119273bf8e4a6f4eec0a650"}]}':str)
clean_val={'prot_scheme_id_list': [{'priority': 0, 'identifier': 2, 'key_index': 1}, {'priority': 1, 'identifier': 1, 'key_index': 2}], 'hnet_pubkey_list': [{'hnet_pubkey_identifier': 27, 'hnet_pubkey': '0472da71976234ce833a6907425867b82e074d44ef907dfb4b3e21c1c2256ebcd15a7ded52fcbb097a4ed250e036c7b9c8c7004c4eedc4f068cd7bf8d3f900e3b4'}, {'hnet_pubkey_identifier': 30, 'hnet_pubkey': '5a8d38864820197c3394b92613b20b91633cbd897119273bf8e4a6f4eec0a650'}]}:{list, list}
previous value: []
skipping, param not in template.
ok: TS48v5_SAIP2.1A_NoBERTLV.der SdKeyScp02Kvn20AesDek(val='01020304050607080910111213141516':str)
clean_val=b'\x01\x02\x03\x04\x05\x06\x07\x08\t\x10\x11\x12\x13\x14\x15\x16':bytes
previous value: []
@@ -1049,6 +1089,46 @@ ok: TS48v5_SAIP2.3_BERTLV_SUCI.der MncLen(val=3:int)
previous value: ['2']
read_back_val={'MNC-LEN': '3'}:{str}
ok: TS48v5_SAIP2.3_BERTLV_SUCI.der SuciActive(val='SUCI-on':str)
clean_val=True:bool
previous value: ['SUCI-on']
read_back_val={'5G-SUCI-active': 'SUCI-on'}:{str}
ok: TS48v5_SAIP2.3_BERTLV_SUCI.der SuciActive(val='SUCI-off':str)
clean_val=False:bool
previous value: ['SUCI-on']
read_back_val={'5G-SUCI-active': 'SUCI-off'}:{str}
ok: TS48v5_SAIP2.3_BERTLV_SUCI.der SuciInUsim(val='SUCI-in-UE':str)
clean_val=False:bool
previous value: ['SUCI-in-USIM']
read_back_val={'5G-SUCI-in-USIM': 'SUCI-in-UE'}:{str}
ok: TS48v5_SAIP2.3_BERTLV_SUCI.der SuciInUsim(val='SUCI-in-USIM':str)
clean_val=True:bool
previous value: ['SUCI-in-USIM']
read_back_val={'5G-SUCI-in-USIM': 'SUCI-in-USIM'}:{str}
ok: TS48v5_SAIP2.3_BERTLV_SUCI.der SuciRi(val='123':str)
clean_val='123':str
previous value: ['0']
read_back_val={'5G-SUCI-RI': '123'}:{hexstr}
ok: TS48v5_SAIP2.3_BERTLV_SUCI.der SuciRi(val='0':str)
clean_val='0':str
previous value: ['0']
read_back_val={'5G-SUCI-RI': '0'}:{hexstr}
ok: TS48v5_SAIP2.3_BERTLV_SUCI.der SuciRi(val='9999':str)
clean_val='9999':str
previous value: ['0']
read_back_val={'5G-SUCI-RI': '9999'}:{hexstr}
ok: TS48v5_SAIP2.3_BERTLV_SUCI.der SuciCalcInfo(val='{"prot_scheme_id_list": [{"priority": 0, "identifier": 2, "key_index": 1}, {"priority": 1, "identifier": 1, "key_index": 2}], "hnet_pubkey_list": [{"hnet_pubkey_identifier": 27, "hnet_pubkey": "0472da71976234ce833a6907425867b82e074d44ef907dfb4b3e21c1c2256ebcd15a7ded52fcbb097a4ed250e036c7b9c8c7004c4eedc4f068cd7bf8d3f900e3b4"}, {"hnet_pubkey_identifier": 30, "hnet_pubkey": "5a8d38864820197c3394b92613b20b91633cbd897119273bf8e4a6f4eec0a650"}]}':str)
clean_val={'prot_scheme_id_list': [{'priority': 0, 'identifier': 2, 'key_index': 1}, {'priority': 1, 'identifier': 1, 'key_index': 2}], 'hnet_pubkey_list': [{'hnet_pubkey_identifier': 27, 'hnet_pubkey': '0472da71976234ce833a6907425867b82e074d44ef907dfb4b3e21c1c2256ebcd15a7ded52fcbb097a4ed250e036c7b9c8c7004c4eedc4f068cd7bf8d3f900e3b4'}, {'hnet_pubkey_identifier': 30, 'hnet_pubkey': '5a8d38864820197c3394b92613b20b91633cbd897119273bf8e4a6f4eec0a650'}]}:{list, list}
previous value: ['{"prot_scheme_id_list": [{"priority": 0, "identifier": 0, "key_index": 0}], "hnet_pubkey_list": []}']
read_back_val={'5G-SUCI-CalcInfo': '{"prot_scheme_id_list": [{"priority": 0, "identifier": 2, "key_index": 1}, {"priority": 1, "identifier": 1, "key_index": 2}], "hnet_pubkey_list": [{"hnet_pubkey_identifier": 27, "hnet_pubkey": "0472da71976234ce833a6907425867b82e074d44ef907dfb4b3e21c1c2256ebcd15a7ded52fcbb097a4ed250e036c7b9c8c7004c4eedc4f068cd7bf8d3f900e3b4"}, {"hnet_pubkey_identifier": 30, "hnet_pubkey": "5a8d38864820197c3394b92613b20b91633cbd897119273bf8e4a6f4eec0a650"}]}'}:{str}
ok: TS48v5_SAIP2.3_BERTLV_SUCI.der SdKeyScp02Kvn20AesDek(val='01020304050607080910111213141516':str)
clean_val=b'\x01\x02\x03\x04\x05\x06\x07\x08\t\x10\x11\x12\x13\x14\x15\x16':bytes
previous value: []
@@ -1884,6 +1964,46 @@ ok: TS48v5_SAIP2.1B_NoBERTLV.der MncLen(val=3:int)
previous value: ['2']
read_back_val={'MNC-LEN': '3'}:{str}
ok: TS48v5_SAIP2.1B_NoBERTLV.der SuciActive(val='SUCI-on':str)
clean_val=True:bool
previous value: ['SUCI-on']
read_back_val={'5G-SUCI-active': 'SUCI-on'}:{str}
ok: TS48v5_SAIP2.1B_NoBERTLV.der SuciActive(val='SUCI-off':str)
clean_val=False:bool
previous value: ['SUCI-on']
read_back_val={'5G-SUCI-active': 'SUCI-off'}:{str}
ok: TS48v5_SAIP2.1B_NoBERTLV.der SuciInUsim(val='SUCI-in-UE':str)
clean_val=False:bool
previous value: ['SUCI-in-UE']
read_back_val={'5G-SUCI-in-USIM': 'SUCI-in-UE'}:{str}
ok: TS48v5_SAIP2.1B_NoBERTLV.der SuciInUsim(val='SUCI-in-USIM':str)
clean_val=True:bool
previous value: ['SUCI-in-UE']
read_back_val={'5G-SUCI-in-USIM': 'SUCI-in-USIM'}:{str}
skip: TS48v5_SAIP2.1B_NoBERTLV.der SuciRi(val='123':str)
clean_val='123':str
previous value: []
skipping, param not in template.
skip: TS48v5_SAIP2.1B_NoBERTLV.der SuciRi(val='0':str)
clean_val='0':str
previous value: []
skipping, param not in template.
skip: TS48v5_SAIP2.1B_NoBERTLV.der SuciRi(val='9999':str)
clean_val='9999':str
previous value: []
skipping, param not in template.
skip: TS48v5_SAIP2.1B_NoBERTLV.der SuciCalcInfo(val='{"prot_scheme_id_list": [{"priority": 0, "identifier": 2, "key_index": 1}, {"priority": 1, "identifier": 1, "key_index": 2}], "hnet_pubkey_list": [{"hnet_pubkey_identifier": 27, "hnet_pubkey": "0472da71976234ce833a6907425867b82e074d44ef907dfb4b3e21c1c2256ebcd15a7ded52fcbb097a4ed250e036c7b9c8c7004c4eedc4f068cd7bf8d3f900e3b4"}, {"hnet_pubkey_identifier": 30, "hnet_pubkey": "5a8d38864820197c3394b92613b20b91633cbd897119273bf8e4a6f4eec0a650"}]}':str)
clean_val={'prot_scheme_id_list': [{'priority': 0, 'identifier': 2, 'key_index': 1}, {'priority': 1, 'identifier': 1, 'key_index': 2}], 'hnet_pubkey_list': [{'hnet_pubkey_identifier': 27, 'hnet_pubkey': '0472da71976234ce833a6907425867b82e074d44ef907dfb4b3e21c1c2256ebcd15a7ded52fcbb097a4ed250e036c7b9c8c7004c4eedc4f068cd7bf8d3f900e3b4'}, {'hnet_pubkey_identifier': 30, 'hnet_pubkey': '5a8d38864820197c3394b92613b20b91633cbd897119273bf8e4a6f4eec0a650'}]}:{list, list}
previous value: []
skipping, param not in template.
ok: TS48v5_SAIP2.1B_NoBERTLV.der SdKeyScp02Kvn20AesDek(val='01020304050607080910111213141516':str)
clean_val=b'\x01\x02\x03\x04\x05\x06\x07\x08\t\x10\x11\x12\x13\x14\x15\x16':bytes
previous value: []
@@ -2719,6 +2839,46 @@ ok: TS48v5_SAIP2.3_NoBERTLV.der MncLen(val=3:int)
previous value: ['2']
read_back_val={'MNC-LEN': '3'}:{str}
ok: TS48v5_SAIP2.3_NoBERTLV.der SuciActive(val='SUCI-on':str)
clean_val=True:bool
previous value: ['SUCI-on']
read_back_val={'5G-SUCI-active': 'SUCI-on'}:{str}
ok: TS48v5_SAIP2.3_NoBERTLV.der SuciActive(val='SUCI-off':str)
clean_val=False:bool
previous value: ['SUCI-on']
read_back_val={'5G-SUCI-active': 'SUCI-off'}:{str}
ok: TS48v5_SAIP2.3_NoBERTLV.der SuciInUsim(val='SUCI-in-UE':str)
clean_val=False:bool
previous value: ['SUCI-in-USIM']
read_back_val={'5G-SUCI-in-USIM': 'SUCI-in-UE'}:{str}
ok: TS48v5_SAIP2.3_NoBERTLV.der SuciInUsim(val='SUCI-in-USIM':str)
clean_val=True:bool
previous value: ['SUCI-in-USIM']
read_back_val={'5G-SUCI-in-USIM': 'SUCI-in-USIM'}:{str}
ok: TS48v5_SAIP2.3_NoBERTLV.der SuciRi(val='123':str)
clean_val='123':str
previous value: ['0']
read_back_val={'5G-SUCI-RI': '123'}:{hexstr}
ok: TS48v5_SAIP2.3_NoBERTLV.der SuciRi(val='0':str)
clean_val='0':str
previous value: ['0']
read_back_val={'5G-SUCI-RI': '0'}:{hexstr}
ok: TS48v5_SAIP2.3_NoBERTLV.der SuciRi(val='9999':str)
clean_val='9999':str
previous value: ['0']
read_back_val={'5G-SUCI-RI': '9999'}:{hexstr}
ok: TS48v5_SAIP2.3_NoBERTLV.der SuciCalcInfo(val='{"prot_scheme_id_list": [{"priority": 0, "identifier": 2, "key_index": 1}, {"priority": 1, "identifier": 1, "key_index": 2}], "hnet_pubkey_list": [{"hnet_pubkey_identifier": 27, "hnet_pubkey": "0472da71976234ce833a6907425867b82e074d44ef907dfb4b3e21c1c2256ebcd15a7ded52fcbb097a4ed250e036c7b9c8c7004c4eedc4f068cd7bf8d3f900e3b4"}, {"hnet_pubkey_identifier": 30, "hnet_pubkey": "5a8d38864820197c3394b92613b20b91633cbd897119273bf8e4a6f4eec0a650"}]}':str)
clean_val={'prot_scheme_id_list': [{'priority': 0, 'identifier': 2, 'key_index': 1}, {'priority': 1, 'identifier': 1, 'key_index': 2}], 'hnet_pubkey_list': [{'hnet_pubkey_identifier': 27, 'hnet_pubkey': '0472da71976234ce833a6907425867b82e074d44ef907dfb4b3e21c1c2256ebcd15a7ded52fcbb097a4ed250e036c7b9c8c7004c4eedc4f068cd7bf8d3f900e3b4'}, {'hnet_pubkey_identifier': 30, 'hnet_pubkey': '5a8d38864820197c3394b92613b20b91633cbd897119273bf8e4a6f4eec0a650'}]}:{list, list}
previous value: ['{"prot_scheme_id_list": [{"priority": 0, "identifier": 0, "key_index": 0}], "hnet_pubkey_list": []}']
read_back_val={'5G-SUCI-CalcInfo': '{"prot_scheme_id_list": [{"priority": 0, "identifier": 2, "key_index": 1}, {"priority": 1, "identifier": 1, "key_index": 2}], "hnet_pubkey_list": [{"hnet_pubkey_identifier": 27, "hnet_pubkey": "0472da71976234ce833a6907425867b82e074d44ef907dfb4b3e21c1c2256ebcd15a7ded52fcbb097a4ed250e036c7b9c8c7004c4eedc4f068cd7bf8d3f900e3b4"}, {"hnet_pubkey_identifier": 30, "hnet_pubkey": "5a8d38864820197c3394b92613b20b91633cbd897119273bf8e4a6f4eec0a650"}]}'}:{str}
ok: TS48v5_SAIP2.3_NoBERTLV.der SdKeyScp02Kvn20AesDek(val='01020304050607080910111213141516':str)
clean_val=b'\x01\x02\x03\x04\x05\x06\x07\x08\t\x10\x11\x12\x13\x14\x15\x16':bytes
previous value: []