saip.SdKey*: transitional name mapping

To help existing applications transition to a common naming scheme for
the SdKey classes, offer this intermediate result, where the SdKey
classes' .name are still unchanged as before generating them.

Change-Id: I974cb6c393a2ed2248a6240c2722d157e9235c33
Jenkins: skip-card-test

pySim/esim/saip/batch.py

@@ -123,6 +123,8 @@ class BatchPersonalization:
                 except Exception as e:
                     raise ValueError(f'{p.param_cls.get_name()} fed by {p.src.name}: {e}') from e
 
+            pes.rebuild_mandatory_services()
+
             yield pes
 
 

pySim/esim/saip/personalization.py

@@ -873,6 +873,30 @@ class SdKey(BinaryParam):
 
         SdKey.all_implementations = []
 
+        transitional_name_mapping = {
+            'SCP02-KVN20-AES-DEK': 'SCP02-20-AES-DEK',
+            'SCP02-KVN20-AES-ENC': 'SCP02-20-AES-ENC',
+            'SCP02-KVN20-AES-MAC': 'SCP02-20-AES-MAC',
+            'SCP02-KVN21-AES-DEK': 'SCP02-21-AES-DEK',
+            'SCP02-KVN21-AES-ENC': 'SCP02-21-AES-ENC',
+            'SCP02-KVN21-AES-MAC': 'SCP02-21-AES-MAC',
+            'SCP02-KVN22-AES-DEK': 'SCP02-22-AES-DEK',
+            'SCP02-KVN22-AES-ENC': 'SCP02-22-AES-ENC',
+            'SCP02-KVN22-AES-MAC': 'SCP02-22-AES-MAC',
+            'SCP02-KVNff-AES-DEK': 'SCP02-ff-AES-DEK',
+            'SCP02-KVNff-AES-ENC': 'SCP02-ff-AES-ENC',
+            'SCP02-KVNff-AES-MAC': 'SCP02-ff-AES-MAC',
+            'SCP03-KVN30-AES-DEK': 'SCP03-30-AES-DEK',
+            'SCP03-KVN30-AES-ENC': 'SCP03-30-AES-ENC',
+            'SCP03-KVN30-AES-MAC': 'SCP03-30-AES-MAC',
+            'SCP03-KVN31-AES-DEK': 'SCP03-31-AES-DEK',
+            'SCP03-KVN31-AES-ENC': 'SCP03-31-AES-ENC',
+            'SCP03-KVN31-AES-MAC': 'SCP03-31-AES-MAC',
+            'SCP03-KVN32-AES-DEK': 'SCP03-32-AES-DEK',
+            'SCP03-KVN32-AES-ENC': 'SCP03-32-AES-ENC',
+            'SCP03-KVN32-AES-MAC': 'SCP03-32-AES-MAC',
+        }
+
         def camel(s):
             return s[:1].upper() + s[1:].lower()
 
@@ -904,6 +928,8 @@ class SdKey(BinaryParam):
 
             max_key_len = attrs.get('allow_len')[-1]
 
+            cls_label = transitional_name_mapping.get(cls_label, cls_label)
+
             attrs.update({
                 'name' : cls_label,
                 'kvn': kvn,
@@ -1156,7 +1182,7 @@ class MilenageRotationConstants(BinaryParam, AlgoConfig):
 
 class MilenageXoringConstants(BinaryParam, AlgoConfig):
     """XOR-ing constants c1,c2,c3,c4,c5 of Milenage, 128bit each. See 3GPP TS 35.206 Sections 2.3 + 5.3.
-    Provided as octet-string concatenation of all 5 constants. The default value by 3GPP is the concetenation
+    Provided as octet-string concatenation of all 5 constants. The default value by 3GPP is the concatenation
     of::
 
      00000000000000000000000000000000

pySim/ts_31_102.py

@@ -335,7 +335,7 @@ class EF_SUCI_Calc_Info(TransparentEF):
         """conversion method to generate list of {hnet_pubkey_identifier, hnet_pubkey} dicts
         from flat [{hnet_pubkey_identifier: }, {net_pubkey: }, ...] list"""
         out = []
-        while len(l):
+        while l:
             a = l.pop(0)
             b = l.pop(0)
             z = {**a, **b}

tests/unittests/test_configurable_parameters.py

@@ -55,8 +55,6 @@ class ConfigurableParameterTest(unittest.TestCase):
         upp_fnames = (
                 'TS48v5_SAIP2.1A_NoBERTLV.der',
                 'TS48v5_SAIP2.3_BERTLV_SUCI.der',
-                'TS48v5_SAIP2.1B_NoBERTLV.der',
-                'TS48v5_SAIP2.3_NoBERTLV.der',
                )
 
         class Paramtest: