remove transitional name mapping

This reverts commit I974cb6c393a2ed2248a6240c2722d157e9235c33

Now, finally, all SdKey classes have a unified logical naming scheme.

Change-Id: Ic185af4a903c2211a5361d023af9e7c6fc57ae78
This commit is contained in:
Neels Hofmeyr
2026-01-23 01:04:36 +01:00
parent 44dbbe5509
commit 8cc7421faa

View File

@@ -760,30 +760,6 @@ class SdKey(BinaryParam):
SdKey.all_implementations = [] 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): def camel(s):
return s[:1].upper() + s[1:].lower() return s[:1].upper() + s[1:].lower()
@@ -815,8 +791,6 @@ class SdKey(BinaryParam):
max_key_len = attrs.get('allow_len')[-1] max_key_len = attrs.get('allow_len')[-1]
cls_label = transitional_name_mapping.get(cls_label, cls_label)
attrs.update({ attrs.update({
'name' : cls_label, 'name' : cls_label,
'kvn': kvn, 'kvn': kvn,