neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42258?usp=email )
Change subject: remove transitional name mapping ......................................................................
remove transitional name mapping
This reverts commit I974cb6c393a2ed2248a6240c2722d157e9235c33
Now, finally, all SdKey classes have a unified logical naming scheme.
Change-Id: Ic185af4a903c2211a5361d023af9e7c6fc57ae78 --- M pySim/esim/saip/personalization.py 1 file changed, 0 insertions(+), 26 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/58/42258/1
diff --git a/pySim/esim/saip/personalization.py b/pySim/esim/saip/personalization.py index 400a9c4..b28d88e 100644 --- a/pySim/esim/saip/personalization.py +++ b/pySim/esim/saip/personalization.py @@ -760,30 +760,6 @@
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()
@@ -815,8 +791,6 @@
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,