laforge submitted this change.

View Change

Approvals: dexter: Looks good to me, approved laforge: Looks good to me, approved Jenkins Builder: Verified
saip: fix key usage qualifier of helper created SD keys

SD_KEY_DEFS holds the GP Key Usage Qualifier as its encoded octet,
SecurityDomainKey expects the decoded FlagsEnum dict. Passing the int
encoded a 0 qualifier for every newly created key...

Change-Id: I4a94562d6052c6796929b81b1f9b9ce5b56dcd20
---
M pySim/esim/saip/personalization.py
M tests/unittests/test_esim_saip.py
2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/pySim/esim/saip/personalization.py b/pySim/esim/saip/personalization.py
index 9e5b7fd..8867f4e 100644
--- a/pySim/esim/saip/personalization.py
+++ b/pySim/esim/saip/personalization.py
@@ -745,10 +745,11 @@
key = pe.find_key(key_version_number=cls.kvn, key_id=cls.key_id)
if not key:
# Could not find matching key to patch, create a new one
+ key_usage_qualifier = KeyUsageQualifier.parse(bytes([cls.key_usage_qual]))
key = SecurityDomainKey(
key_version_number=cls.kvn,
key_id=cls.key_id,
- key_usage_qualifier=cls.key_usage_qual,
+ key_usage_qualifier=key_usage_qualifier,
key_components=set_components,
)
pe.add_key(key)
diff --git a/tests/unittests/test_esim_saip.py b/tests/unittests/test_esim_saip.py
index 50cb9d5..5d44de3 100755
--- a/tests/unittests/test_esim_saip.py
+++ b/tests/unittests/test_esim_saip.py
@@ -22,6 +22,7 @@

from pySim.esim.saip import *
from pySim.esim.saip import personalization
+from pySim.global_platform import KeyUsageQualifier
from pprint import pprint as pp


@@ -154,6 +155,22 @@
print(f'{get_val2=} {set_val=}')
self.assertEqual(get_val2, ({cls.name: set_val},))

+ def test_sd_key_personalization_creates_usage_qualifier(self):
+ """helper created key qualifier must match"""
+ pes = ProfileElementSequence()
+ pes.append(ProfileElementHeader())
+ pes.append(ProfileElementSD())
+ pes.append(ProfileElementEnd())
+
+ cls = personalization.SdKeyScp02Kvn20AesEnc
+ cls('00112233445566778899aabbccddeeff').apply(pes)
+ key = pes.get_pe_for_type('securityDomain').find_key(0x20, 0x01)
+ self.assertEqual(KeyUsageQualifier.build(key.key_usage_qualifier), b'\x18')
+
+ round_trip = ProfileElementSequence.from_der(pes.to_der())
+ key = round_trip.get_pe_for_type('securityDomain').find_key(0x20, 0x01)
+ self.assertEqual(KeyUsageQualifier.build(key.key_usage_qualifier), b'\x18')
+
def test_constructor_encode(self):
"""Test that DER-encoding of PE created by "empty" constructor works without raising exception."""
for cls in [ProfileElementMF, ProfileElementPuk, ProfileElementPin, ProfileElementTelecom,

To view, visit change 43723. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I4a94562d6052c6796929b81b1f9b9ce5b56dcd20
Gerrit-Change-Number: 43723
Gerrit-PatchSet: 3
Gerrit-Owner: Hoernchen <ewild@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>