diff --git a/tests/scripts/generate_psa_tests.py b/tests/scripts/generate_psa_tests.py
index 6f3d726..757055a 100755
--- a/tests/scripts/generate_psa_tests.py
+++ b/tests/scripts/generate_psa_tests.py
@@ -58,6 +58,14 @@
     """
     return [finish_family_dependency(dep, bits) for dep in dependencies]
 
+SYMBOLS_WITHOUT_DEPENDENCY = frozenset([
+    'PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG', # modifier, only in policies
+    'PSA_ALG_AEAD_WITH_SHORTENED_TAG', # modifier
+    'PSA_ALG_ANY_HASH', # only in policies
+    'PSA_ALG_AT_LEAST_THIS_LENGTH_MAC', # modifier, only in policies
+    'PSA_ALG_KEY_AGREEMENT', # chaining
+    'PSA_ALG_TRUNCATED_MAC', # modifier
+])
 def automatic_dependencies(*expressions: str) -> List[str]:
     """Infer dependencies of a test case by looking for PSA_xxx symbols.
 
@@ -68,6 +76,7 @@
     used = set()
     for expr in expressions:
         used.update(re.findall(r'PSA_(?:ALG|ECC_FAMILY|KEY_TYPE)_\w+', expr))
+    used.difference_update(SYMBOLS_WITHOUT_DEPENDENCY)
     return sorted(psa_want_symbol(name) for name in used)
 
 # A temporary hack: at the time of writing, not all dependency symbols
diff --git a/tests/suites/test_suite_psa_crypto_storage_format.current.data b/tests/suites/test_suite_psa_crypto_storage_format.current.data
index d113033..5b859ad 100644
--- a/tests/suites/test_suite_psa_crypto_storage_format.current.data
+++ b/tests/suites/test_suite_psa_crypto_storage_format.current.data
@@ -441,171 +441,171 @@
 key_storage_save:0x0001:PSA_KEY_TYPE_RSA_PUBLIC_KEY:1536:PSA_KEY_USAGE_EXPORT:0x0000:0x0000:"3081c90281c100c870feb6ca6b1d2bd9f2dd99e20f1fe2d7e5192de662229dbe162bd1ba66336a7182903ca0b72796cd441c83d24bcdc3e9a2f5e4399c8a043f1c3ddf04754a66d4cfe7b3671a37dd31a9b4c13bfe06ee90f9d94ddaa06de67a52ac863e68f756736ceb014405a6160579640f831dddccc34ad0b05070e3f9954a58d1815813e1b83bcadba814789c87f1ef2ba5d738b793ec456a67360eea1b5faf1c7cc7bf24f3b2a9d0f8958b1096e0f0c335f8888d0c63a51c3c0337214fa3f5efdf6dcc350203010001":"505341004b455900000000000100000001400006010000000000000000000000cc0000003081c90281c100c870feb6ca6b1d2bd9f2dd99e20f1fe2d7e5192de662229dbe162bd1ba66336a7182903ca0b72796cd441c83d24bcdc3e9a2f5e4399c8a043f1c3ddf04754a66d4cfe7b3671a37dd31a9b4c13bfe06ee90f9d94ddaa06de67a52ac863e68f756736ceb014405a6160579640f831dddccc34ad0b05070e3f9954a58d1815813e1b83bcadba814789c87f1ef2ba5d738b793ec456a67360eea1b5faf1c7cc7bf24f3b2a9d0f8958b1096e0f0c335f8888d0c63a51c3c0337214fa3f5efdf6dcc350203010001"
 
 PSA storage save: alg: PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_CCM, 1)
-depends_on:PSA_WANT_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_CCM, 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000081410500000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_CCM, 1)
-depends_on:PSA_WANT_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_CCM, 1):"4c":"505341004b455900000000000100000001100800010000000000000000814105010000004c"
 
 PSA storage save: alg: PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_CHACHA20_POLY1305, 1)
-depends_on:PSA_WANT_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG:PSA_WANT_ALG_CHACHA20_POLY1305:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CHACHA20_POLY1305:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_CHACHA20_POLY1305, 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000085010500000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_CHACHA20_POLY1305, 1)
-depends_on:PSA_WANT_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG:PSA_WANT_ALG_CHACHA20_POLY1305:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CHACHA20_POLY1305:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_CHACHA20_POLY1305, 1):"4c":"505341004b455900000000000100000001100800010000000000000000850105010000004c"
 
 PSA storage save: alg: PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_GCM, 1)
-depends_on:PSA_WANT_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_GCM, 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000082410500000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_GCM, 1)
-depends_on:PSA_WANT_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_GCM, 1):"4c":"505341004b455900000000000100000001100800010000000000000000824105010000004c"
 
 PSA storage save: alg: PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_CCM, 63)
-depends_on:PSA_WANT_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_CCM, 63):0x0000:"4b":"505341004b4559000000000001000000011008000100000000817f0500000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_CCM, 63)
-depends_on:PSA_WANT_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_CCM, 63):"4c":"505341004b455900000000000100000001100800010000000000000000817f05010000004c"
 
 PSA storage save: alg: PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM, 1)
-depends_on:PSA_WANT_ALG_AEAD_WITH_SHORTENED_TAG:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM, 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000001410500000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM, 1)
-depends_on:PSA_WANT_ALG_AEAD_WITH_SHORTENED_TAG:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM, 1):"4c":"505341004b455900000000000100000001100800010000000000000000014105010000004c"
 
 PSA storage save: alg: PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CHACHA20_POLY1305, 1)
-depends_on:PSA_WANT_ALG_AEAD_WITH_SHORTENED_TAG:PSA_WANT_ALG_CHACHA20_POLY1305:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CHACHA20_POLY1305:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CHACHA20_POLY1305, 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000005010500000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CHACHA20_POLY1305, 1)
-depends_on:PSA_WANT_ALG_AEAD_WITH_SHORTENED_TAG:PSA_WANT_ALG_CHACHA20_POLY1305:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CHACHA20_POLY1305:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CHACHA20_POLY1305, 1):"4c":"505341004b455900000000000100000001100800010000000000000000050105010000004c"
 
 PSA storage save: alg: PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM, 1)
-depends_on:PSA_WANT_ALG_AEAD_WITH_SHORTENED_TAG:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM, 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000002410500000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM, 1)
-depends_on:PSA_WANT_ALG_AEAD_WITH_SHORTENED_TAG:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM, 1):"4c":"505341004b455900000000000100000001100800010000000000000000024105010000004c"
 
 PSA storage save: alg: PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM, 63)
-depends_on:PSA_WANT_ALG_AEAD_WITH_SHORTENED_TAG:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM, 63):0x0000:"4b":"505341004b4559000000000001000000011008000100000000017f0500000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM, 63)
-depends_on:PSA_WANT_ALG_AEAD_WITH_SHORTENED_TAG:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM, 63):"4c":"505341004b455900000000000100000001100800010000000000000000017f05010000004c"
 
 PSA storage save: alg: PSA_ALG_ANY_HASH
-depends_on:PSA_WANT_ALG_ANY_HASH:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_ANY_HASH:0x0000:"4b":"505341004b45590000000000010000000110080001000000ff00000200000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_ANY_HASH
-depends_on:PSA_WANT_ALG_ANY_HASH:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_ANY_HASH:"4c":"505341004b4559000000000001000000011008000100000000000000ff000002010000004c"
 
 PSA storage save: alg: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_CBC_MAC, 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_CBC_MAC, 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000081c10300000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_CBC_MAC, 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_CBC_MAC, 1):"4c":"505341004b45590000000000010000000110080001000000000000000081c103010000004c"
 
 PSA storage save: alg: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_CMAC, 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_CMAC, 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000082c10300000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_CMAC, 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_CMAC, 1):"4c":"505341004b45590000000000010000000110080001000000000000000082c103010000004c"
 
 PSA storage save: alg: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_MD2 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD2:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD2:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_MD2 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000180810300000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_MD2 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD2:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD2:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_MD2 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000001808103010000004c"
 
 PSA storage save: alg: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_MD4 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD4:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD4:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_MD4 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000280810300000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_MD4 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD4:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD4:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_MD4 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000002808103010000004c"
 
 PSA storage save: alg: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_MD5 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD5:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD5:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_MD5 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000380810300000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_MD5 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD5:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD5:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_MD5 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000003808103010000004c"
 
 PSA storage save: alg: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_RIPEMD160 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_RIPEMD160:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_RIPEMD160:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_RIPEMD160 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000480810300000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_RIPEMD160 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_RIPEMD160:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_RIPEMD160:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_RIPEMD160 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000004808103010000004c"
 
 PSA storage save: alg: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_1 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_1:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_1:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_1 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000580810300000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_1 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_1:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_1:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_1 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000005808103010000004c"
 
 PSA storage save: alg: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_224 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_224:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_224:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_224 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000880810300000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_224 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_224:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_224:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_224 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000008808103010000004c"
 
 PSA storage save: alg: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_256 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_256 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000980810300000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_256 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_256 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000009808103010000004c"
 
 PSA storage save: alg: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_384 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_384 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000a80810300000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_384 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_384 ), 1):"4c":"505341004b45590000000000010000000110080001000000000000000a808103010000004c"
 
 PSA storage save: alg: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_512 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_512:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_512:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_512 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000b80810300000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_512 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_512:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_512:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_512 ), 1):"4c":"505341004b45590000000000010000000110080001000000000000000b808103010000004c"
 
 PSA storage save: alg: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_CBC_MAC, 63)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_CBC_MAC, 63):0x0000:"4b":"505341004b455900000000000100000001100800010000000081ff0300000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_CBC_MAC, 63)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_CBC_MAC, 63):"4c":"505341004b45590000000000010000000110080001000000000000000081ff03010000004c"
 
 PSA storage save: alg: PSA_ALG_CBC_MAC
@@ -817,11 +817,11 @@
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_DETERMINISTIC_ECDSA(PSA_ALG_SHA_512):"4c":"505341004b45590000000000010000000110080001000000000000000b070006010000004c"
 
 PSA storage save: alg: PSA_ALG_DETERMINISTIC_ECDSA( PSA_ALG_ANY_HASH )
-depends_on:PSA_WANT_ALG_ANY_HASH:PSA_WANT_ALG_DETERMINISTIC_ECDSA:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_DETERMINISTIC_ECDSA:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_DETERMINISTIC_ECDSA( PSA_ALG_ANY_HASH ):0x0000:"4b":"505341004b45590000000000010000000110080001000000ff07000600000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_DETERMINISTIC_ECDSA( PSA_ALG_ANY_HASH )
-depends_on:PSA_WANT_ALG_ANY_HASH:PSA_WANT_ALG_DETERMINISTIC_ECDSA:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_DETERMINISTIC_ECDSA:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_DETERMINISTIC_ECDSA( PSA_ALG_ANY_HASH ):"4c":"505341004b4559000000000001000000011008000100000000000000ff070006010000004c"
 
 PSA storage save: alg: PSA_ALG_DETERMINISTIC_ECDSA( PSA_ALG_SHA_256 )
@@ -993,11 +993,11 @@
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_ECDSA(PSA_ALG_SHA_512):"4c":"505341004b45590000000000010000000110080001000000000000000b060006010000004c"
 
 PSA storage save: alg: PSA_ALG_ECDSA( PSA_ALG_ANY_HASH )
-depends_on:PSA_WANT_ALG_ANY_HASH:PSA_WANT_ALG_ECDSA:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDSA:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_ECDSA( PSA_ALG_ANY_HASH ):0x0000:"4b":"505341004b45590000000000010000000110080001000000ff06000600000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_ECDSA( PSA_ALG_ANY_HASH )
-depends_on:PSA_WANT_ALG_ANY_HASH:PSA_WANT_ALG_ECDSA:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDSA:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_ECDSA( PSA_ALG_ANY_HASH ):"4c":"505341004b4559000000000001000000011008000100000000000000ff060006010000004c"
 
 PSA storage save: alg: PSA_ALG_ECDSA( PSA_ALG_SHA_256 )
@@ -1281,91 +1281,91 @@
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_HMAC( PSA_ALG_SHA_512 ):"4c":"505341004b45590000000000010000000110080001000000000000000b008003010000004c"
 
 PSA storage save: alg: PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ))
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 )):0x0000:"4b":"505341004b455900000000000100000001100800010000000901020900000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ))
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 )):"4c":"505341004b455900000000000100000001100800010000000000000009010209010000004c"
 
 PSA storage save: alg: PSA_ALG_KEY_AGREEMENT(PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ))
-depends_on:PSA_WANT_ALG_FFDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_FFDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_KEY_AGREEMENT(PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 )):0x0000:"4b":"505341004b455900000000000100000001100800010000000901010900000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_KEY_AGREEMENT(PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ))
-depends_on:PSA_WANT_ALG_FFDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_FFDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_KEY_AGREEMENT(PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 )):"4c":"505341004b455900000000000100000001100800010000000000000009010109010000004c"
 
 PSA storage save: alg: PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 ))
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 )):0x0000:"4b":"505341004b455900000000000100000001100800010000000a01020900000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 ))
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 )):"4c":"505341004b45590000000000010000000110080001000000000000000a010209010000004c"
 
 PSA storage save: alg: PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PRF( PSA_ALG_SHA_256 ))
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_256:PSA_WANT_ALG_TLS12_PRF:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_SHA_256:PSA_WANT_ALG_TLS12_PRF:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PRF( PSA_ALG_SHA_256 )):0x0000:"4b":"505341004b455900000000000100000001100800010000000902020900000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PRF( PSA_ALG_SHA_256 ))
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_256:PSA_WANT_ALG_TLS12_PRF:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_SHA_256:PSA_WANT_ALG_TLS12_PRF:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PRF( PSA_ALG_SHA_256 )):"4c":"505341004b455900000000000100000001100800010000000000000009020209010000004c"
 
 PSA storage save: alg: PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PRF( PSA_ALG_SHA_384 ))
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_384:PSA_WANT_ALG_TLS12_PRF:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_SHA_384:PSA_WANT_ALG_TLS12_PRF:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PRF( PSA_ALG_SHA_384 )):0x0000:"4b":"505341004b455900000000000100000001100800010000000a02020900000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PRF( PSA_ALG_SHA_384 ))
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_384:PSA_WANT_ALG_TLS12_PRF:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_SHA_384:PSA_WANT_ALG_TLS12_PRF:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PRF( PSA_ALG_SHA_384 )):"4c":"505341004b45590000000000010000000110080001000000000000000a020209010000004c"
 
 PSA storage save: alg: PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PSK_TO_MS( PSA_ALG_SHA_256 ))
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_256:PSA_WANT_ALG_TLS12_PSK_TO_MS:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_SHA_256:PSA_WANT_ALG_TLS12_PSK_TO_MS:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PSK_TO_MS( PSA_ALG_SHA_256 )):0x0000:"4b":"505341004b455900000000000100000001100800010000000903020900000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PSK_TO_MS( PSA_ALG_SHA_256 ))
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_256:PSA_WANT_ALG_TLS12_PSK_TO_MS:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_SHA_256:PSA_WANT_ALG_TLS12_PSK_TO_MS:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PSK_TO_MS( PSA_ALG_SHA_256 )):"4c":"505341004b455900000000000100000001100800010000000000000009030209010000004c"
 
 PSA storage save: alg: PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PSK_TO_MS( PSA_ALG_SHA_384 ))
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_384:PSA_WANT_ALG_TLS12_PSK_TO_MS:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_SHA_384:PSA_WANT_ALG_TLS12_PSK_TO_MS:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PSK_TO_MS( PSA_ALG_SHA_384 )):0x0000:"4b":"505341004b455900000000000100000001100800010000000a03020900000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PSK_TO_MS( PSA_ALG_SHA_384 ))
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_384:PSA_WANT_ALG_TLS12_PSK_TO_MS:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_SHA_384:PSA_WANT_ALG_TLS12_PSK_TO_MS:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PSK_TO_MS( PSA_ALG_SHA_384 )):"4c":"505341004b45590000000000010000000110080001000000000000000a030209010000004c"
 
 PSA storage save: alg: PSA_ALG_KEY_AGREEMENT( PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ) )
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_KEY_AGREEMENT( PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ) ):0x0000:"4b":"505341004b455900000000000100000001100800010000000901020900000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_KEY_AGREEMENT( PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ) )
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_KEY_AGREEMENT( PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ) ):"4c":"505341004b455900000000000100000001100800010000000000000009010209010000004c"
 
 PSA storage save: alg: PSA_ALG_KEY_AGREEMENT( PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 ) )
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_KEY_AGREEMENT( PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 ) ):0x0000:"4b":"505341004b455900000000000100000001100800010000000a01020900000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_KEY_AGREEMENT( PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 ) )
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_KEY_AGREEMENT( PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 ) ):"4c":"505341004b45590000000000010000000110080001000000000000000a010209010000004c"
 
 PSA storage save: alg: PSA_ALG_KEY_AGREEMENT( PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ) )
-depends_on:PSA_WANT_ALG_FFDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_FFDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_KEY_AGREEMENT( PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ) ):0x0000:"4b":"505341004b455900000000000100000001100800010000000901010900000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_KEY_AGREEMENT( PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ) )
-depends_on:PSA_WANT_ALG_FFDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_FFDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_KEY_AGREEMENT( PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ) ):"4c":"505341004b455900000000000100000001100800010000000000000009010109010000004c"
 
 PSA storage save: alg: PSA_ALG_KEY_AGREEMENT( PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 ) )
-depends_on:PSA_WANT_ALG_FFDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_FFDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_KEY_AGREEMENT( PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 ) ):0x0000:"4b":"505341004b455900000000000100000001100800010000000a01010900000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_KEY_AGREEMENT( PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 ) )
-depends_on:PSA_WANT_ALG_FFDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_FFDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_KEY_AGREEMENT( PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 ) ):"4c":"505341004b45590000000000010000000110080001000000000000000a010109010000004c"
 
 PSA storage save: alg: PSA_ALG_MD2
@@ -1577,11 +1577,11 @@
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_RSA_PKCS1V15_SIGN(PSA_ALG_SHA_512):"4c":"505341004b45590000000000010000000110080001000000000000000b020006010000004c"
 
 PSA storage save: alg: PSA_ALG_RSA_PKCS1V15_SIGN( PSA_ALG_ANY_HASH )
-depends_on:PSA_WANT_ALG_ANY_HASH:PSA_WANT_ALG_RSA_PKCS1V15_SIGN:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_RSA_PKCS1V15_SIGN:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_RSA_PKCS1V15_SIGN( PSA_ALG_ANY_HASH ):0x0000:"4b":"505341004b45590000000000010000000110080001000000ff02000600000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_RSA_PKCS1V15_SIGN( PSA_ALG_ANY_HASH )
-depends_on:PSA_WANT_ALG_ANY_HASH:PSA_WANT_ALG_RSA_PKCS1V15_SIGN:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_RSA_PKCS1V15_SIGN:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_RSA_PKCS1V15_SIGN( PSA_ALG_ANY_HASH ):"4c":"505341004b4559000000000001000000011008000100000000000000ff020006010000004c"
 
 PSA storage save: alg: PSA_ALG_RSA_PKCS1V15_SIGN( PSA_ALG_SHA_256 )
@@ -1673,11 +1673,11 @@
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_RSA_PSS(PSA_ALG_SHA_512):"4c":"505341004b45590000000000010000000110080001000000000000000b030006010000004c"
 
 PSA storage save: alg: PSA_ALG_RSA_PSS( PSA_ALG_ANY_HASH )
-depends_on:PSA_WANT_ALG_ANY_HASH:PSA_WANT_ALG_RSA_PSS:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_RSA_PSS:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_RSA_PSS( PSA_ALG_ANY_HASH ):0x0000:"4b":"505341004b45590000000000010000000110080001000000ff03000600000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_RSA_PSS( PSA_ALG_ANY_HASH )
-depends_on:PSA_WANT_ALG_ANY_HASH:PSA_WANT_ALG_RSA_PSS:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_RSA_PSS:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_RSA_PSS( PSA_ALG_ANY_HASH ):"4c":"505341004b4559000000000001000000011008000100000000000000ff030006010000004c"
 
 PSA storage save: alg: PSA_ALG_RSA_PSS( PSA_ALG_SHA_256 )
@@ -1969,99 +1969,99 @@
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TLS12_PSK_TO_MS( PSA_ALG_SHA_384 ):"4c":"505341004b45590000000000010000000110080001000000000000000a030008010000004c"
 
 PSA storage save: alg: PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC, 1)
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC, 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000001c10300000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC, 1)
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC, 1):"4c":"505341004b45590000000000010000000110080001000000000000000001c103010000004c"
 
 PSA storage save: alg: PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC, 1)
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC, 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000002c10300000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC, 1)
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC, 1):"4c":"505341004b45590000000000010000000110080001000000000000000002c103010000004c"
 
 PSA storage save: alg: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_MD2 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD2:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD2:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_MD2 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000100810300000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_MD2 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD2:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD2:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_MD2 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000001008103010000004c"
 
 PSA storage save: alg: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_MD4 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD4:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD4:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_MD4 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000200810300000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_MD4 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD4:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD4:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_MD4 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000002008103010000004c"
 
 PSA storage save: alg: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_MD5 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD5:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD5:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_MD5 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000300810300000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_MD5 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD5:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD5:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_MD5 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000003008103010000004c"
 
 PSA storage save: alg: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_RIPEMD160 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_RIPEMD160:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_RIPEMD160:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_RIPEMD160 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000400810300000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_RIPEMD160 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_RIPEMD160:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_RIPEMD160:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_RIPEMD160 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000004008103010000004c"
 
 PSA storage save: alg: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_1 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_1:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_1:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_1 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000500810300000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_1 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_1:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_1:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_1 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000005008103010000004c"
 
 PSA storage save: alg: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_224 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_224:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_224:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_224 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000800810300000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_224 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_224:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_224:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_224 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000008008103010000004c"
 
 PSA storage save: alg: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_256 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_256:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_256 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000900810300000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_256 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_256:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_256 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000009008103010000004c"
 
 PSA storage save: alg: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_384 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_384:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_384 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000a00810300000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_384 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_384:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_384 ), 1):"4c":"505341004b45590000000000010000000110080001000000000000000a008103010000004c"
 
 PSA storage save: alg: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_512 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_512:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_512:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_512 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000b00810300000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_512 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_512:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_512:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_512 ), 1):"4c":"505341004b45590000000000010000000110080001000000000000000b008103010000004c"
 
 PSA storage save: alg: PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC, 63)
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC, 63):0x0000:"4b":"505341004b455900000000000100000001100800010000000001ff0300000000010000004b"
 
 PSA storage save: alg2: PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC, 63)
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_save:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC, 63):"4c":"505341004b45590000000000010000000110080001000000000000000001ff03010000004c"
 
 PSA storage save: alg: PSA_ALG_XTS
diff --git a/tests/suites/test_suite_psa_crypto_storage_format.v0.data b/tests/suites/test_suite_psa_crypto_storage_format.v0.data
index 3e19a53..9e9d7f9 100644
--- a/tests/suites/test_suite_psa_crypto_storage_format.v0.data
+++ b/tests/suites/test_suite_psa_crypto_storage_format.v0.data
@@ -441,171 +441,171 @@
 key_storage_read:0x0001:PSA_KEY_TYPE_RSA_PUBLIC_KEY:1536:PSA_KEY_USAGE_EXPORT:0x0000:0x0000:"3081c90281c100c870feb6ca6b1d2bd9f2dd99e20f1fe2d7e5192de662229dbe162bd1ba66336a7182903ca0b72796cd441c83d24bcdc3e9a2f5e4399c8a043f1c3ddf04754a66d4cfe7b3671a37dd31a9b4c13bfe06ee90f9d94ddaa06de67a52ac863e68f756736ceb014405a6160579640f831dddccc34ad0b05070e3f9954a58d1815813e1b83bcadba814789c87f1ef2ba5d738b793ec456a67360eea1b5faf1c7cc7bf24f3b2a9d0f8958b1096e0f0c335f8888d0c63a51c3c0337214fa3f5efdf6dcc350203010001":"505341004b455900000000000100000001400006010000000000000000000000cc0000003081c90281c100c870feb6ca6b1d2bd9f2dd99e20f1fe2d7e5192de662229dbe162bd1ba66336a7182903ca0b72796cd441c83d24bcdc3e9a2f5e4399c8a043f1c3ddf04754a66d4cfe7b3671a37dd31a9b4c13bfe06ee90f9d94ddaa06de67a52ac863e68f756736ceb014405a6160579640f831dddccc34ad0b05070e3f9954a58d1815813e1b83bcadba814789c87f1ef2ba5d738b793ec456a67360eea1b5faf1c7cc7bf24f3b2a9d0f8958b1096e0f0c335f8888d0c63a51c3c0337214fa3f5efdf6dcc350203010001":1
 
 PSA storage read: alg: PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_CCM, 1)
-depends_on:PSA_WANT_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_CCM, 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000081410500000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_CCM, 1)
-depends_on:PSA_WANT_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_CCM, 1):"4c":"505341004b455900000000000100000001100800010000000000000000814105010000004c":0
 
 PSA storage read: alg: PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_CHACHA20_POLY1305, 1)
-depends_on:PSA_WANT_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG:PSA_WANT_ALG_CHACHA20_POLY1305:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CHACHA20_POLY1305:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_CHACHA20_POLY1305, 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000085010500000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_CHACHA20_POLY1305, 1)
-depends_on:PSA_WANT_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG:PSA_WANT_ALG_CHACHA20_POLY1305:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CHACHA20_POLY1305:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_CHACHA20_POLY1305, 1):"4c":"505341004b455900000000000100000001100800010000000000000000850105010000004c":0
 
 PSA storage read: alg: PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_GCM, 1)
-depends_on:PSA_WANT_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_GCM, 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000082410500000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_GCM, 1)
-depends_on:PSA_WANT_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_GCM, 1):"4c":"505341004b455900000000000100000001100800010000000000000000824105010000004c":0
 
 PSA storage read: alg: PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_CCM, 63)
-depends_on:PSA_WANT_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_CCM, 63):0x0000:"4b":"505341004b4559000000000001000000011008000100000000817f0500000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_CCM, 63)
-depends_on:PSA_WANT_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG(PSA_ALG_CCM, 63):"4c":"505341004b455900000000000100000001100800010000000000000000817f05010000004c":0
 
 PSA storage read: alg: PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM, 1)
-depends_on:PSA_WANT_ALG_AEAD_WITH_SHORTENED_TAG:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM, 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000001410500000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM, 1)
-depends_on:PSA_WANT_ALG_AEAD_WITH_SHORTENED_TAG:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM, 1):"4c":"505341004b455900000000000100000001100800010000000000000000014105010000004c":0
 
 PSA storage read: alg: PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CHACHA20_POLY1305, 1)
-depends_on:PSA_WANT_ALG_AEAD_WITH_SHORTENED_TAG:PSA_WANT_ALG_CHACHA20_POLY1305:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CHACHA20_POLY1305:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CHACHA20_POLY1305, 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000005010500000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CHACHA20_POLY1305, 1)
-depends_on:PSA_WANT_ALG_AEAD_WITH_SHORTENED_TAG:PSA_WANT_ALG_CHACHA20_POLY1305:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CHACHA20_POLY1305:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CHACHA20_POLY1305, 1):"4c":"505341004b455900000000000100000001100800010000000000000000050105010000004c":0
 
 PSA storage read: alg: PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM, 1)
-depends_on:PSA_WANT_ALG_AEAD_WITH_SHORTENED_TAG:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM, 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000002410500000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM, 1)
-depends_on:PSA_WANT_ALG_AEAD_WITH_SHORTENED_TAG:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM, 1):"4c":"505341004b455900000000000100000001100800010000000000000000024105010000004c":0
 
 PSA storage read: alg: PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM, 63)
-depends_on:PSA_WANT_ALG_AEAD_WITH_SHORTENED_TAG:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM, 63):0x0000:"4b":"505341004b4559000000000001000000011008000100000000017f0500000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM, 63)
-depends_on:PSA_WANT_ALG_AEAD_WITH_SHORTENED_TAG:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM, 63):"4c":"505341004b455900000000000100000001100800010000000000000000017f05010000004c":0
 
 PSA storage read: alg: PSA_ALG_ANY_HASH
-depends_on:PSA_WANT_ALG_ANY_HASH:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_ANY_HASH:0x0000:"4b":"505341004b45590000000000010000000110080001000000ff00000200000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_ANY_HASH
-depends_on:PSA_WANT_ALG_ANY_HASH:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_ANY_HASH:"4c":"505341004b4559000000000001000000011008000100000000000000ff000002010000004c":0
 
 PSA storage read: alg: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_CBC_MAC, 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_CBC_MAC, 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000081c10300000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_CBC_MAC, 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_CBC_MAC, 1):"4c":"505341004b45590000000000010000000110080001000000000000000081c103010000004c":0
 
 PSA storage read: alg: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_CMAC, 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_CMAC, 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000082c10300000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_CMAC, 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_CMAC, 1):"4c":"505341004b45590000000000010000000110080001000000000000000082c103010000004c":0
 
 PSA storage read: alg: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_MD2 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD2:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD2:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_MD2 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000180810300000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_MD2 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD2:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD2:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_MD2 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000001808103010000004c":0
 
 PSA storage read: alg: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_MD4 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD4:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD4:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_MD4 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000280810300000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_MD4 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD4:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD4:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_MD4 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000002808103010000004c":0
 
 PSA storage read: alg: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_MD5 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD5:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD5:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_MD5 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000380810300000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_MD5 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD5:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD5:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_MD5 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000003808103010000004c":0
 
 PSA storage read: alg: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_RIPEMD160 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_RIPEMD160:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_RIPEMD160:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_RIPEMD160 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000480810300000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_RIPEMD160 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_RIPEMD160:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_RIPEMD160:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_RIPEMD160 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000004808103010000004c":0
 
 PSA storage read: alg: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_1 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_1:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_1:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_1 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000580810300000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_1 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_1:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_1:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_1 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000005808103010000004c":0
 
 PSA storage read: alg: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_224 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_224:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_224:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_224 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000880810300000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_224 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_224:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_224:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_224 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000008808103010000004c":0
 
 PSA storage read: alg: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_256 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_256 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000980810300000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_256 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_256 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000009808103010000004c":0
 
 PSA storage read: alg: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_384 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_384 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000a80810300000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_384 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_384 ), 1):"4c":"505341004b45590000000000010000000110080001000000000000000a808103010000004c":0
 
 PSA storage read: alg: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_512 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_512:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_512:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_512 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000b80810300000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_512 ), 1)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_512:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_512:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_512 ), 1):"4c":"505341004b45590000000000010000000110080001000000000000000b808103010000004c":0
 
 PSA storage read: alg: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_CBC_MAC, 63)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_CBC_MAC, 63):0x0000:"4b":"505341004b455900000000000100000001100800010000000081ff0300000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_CBC_MAC, 63)
-depends_on:PSA_WANT_ALG_AT_LEAST_THIS_LENGTH_MAC:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_AT_LEAST_THIS_LENGTH_MAC(PSA_ALG_CBC_MAC, 63):"4c":"505341004b45590000000000010000000110080001000000000000000081ff03010000004c":0
 
 PSA storage read: alg: PSA_ALG_CBC_MAC
@@ -817,11 +817,11 @@
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_DETERMINISTIC_ECDSA(PSA_ALG_SHA_512):"4c":"505341004b45590000000000010000000110080001000000000000000b070006010000004c":0
 
 PSA storage read: alg: PSA_ALG_DETERMINISTIC_ECDSA( PSA_ALG_ANY_HASH )
-depends_on:PSA_WANT_ALG_ANY_HASH:PSA_WANT_ALG_DETERMINISTIC_ECDSA:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_DETERMINISTIC_ECDSA:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_DETERMINISTIC_ECDSA( PSA_ALG_ANY_HASH ):0x0000:"4b":"505341004b45590000000000010000000110080001000000ff07000600000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_DETERMINISTIC_ECDSA( PSA_ALG_ANY_HASH )
-depends_on:PSA_WANT_ALG_ANY_HASH:PSA_WANT_ALG_DETERMINISTIC_ECDSA:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_DETERMINISTIC_ECDSA:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_DETERMINISTIC_ECDSA( PSA_ALG_ANY_HASH ):"4c":"505341004b4559000000000001000000011008000100000000000000ff070006010000004c":0
 
 PSA storage read: alg: PSA_ALG_DETERMINISTIC_ECDSA( PSA_ALG_SHA_256 )
@@ -993,11 +993,11 @@
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_ECDSA(PSA_ALG_SHA_512):"4c":"505341004b45590000000000010000000110080001000000000000000b060006010000004c":0
 
 PSA storage read: alg: PSA_ALG_ECDSA( PSA_ALG_ANY_HASH )
-depends_on:PSA_WANT_ALG_ANY_HASH:PSA_WANT_ALG_ECDSA:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDSA:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_ECDSA( PSA_ALG_ANY_HASH ):0x0000:"4b":"505341004b45590000000000010000000110080001000000ff06000600000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_ECDSA( PSA_ALG_ANY_HASH )
-depends_on:PSA_WANT_ALG_ANY_HASH:PSA_WANT_ALG_ECDSA:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDSA:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_ECDSA( PSA_ALG_ANY_HASH ):"4c":"505341004b4559000000000001000000011008000100000000000000ff060006010000004c":0
 
 PSA storage read: alg: PSA_ALG_ECDSA( PSA_ALG_SHA_256 )
@@ -1281,91 +1281,91 @@
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_HMAC( PSA_ALG_SHA_512 ):"4c":"505341004b45590000000000010000000110080001000000000000000b008003010000004c":0
 
 PSA storage read: alg: PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ))
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 )):0x0000:"4b":"505341004b455900000000000100000001100800010000000901020900000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ))
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 )):"4c":"505341004b455900000000000100000001100800010000000000000009010209010000004c":0
 
 PSA storage read: alg: PSA_ALG_KEY_AGREEMENT(PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ))
-depends_on:PSA_WANT_ALG_FFDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_FFDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_KEY_AGREEMENT(PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 )):0x0000:"4b":"505341004b455900000000000100000001100800010000000901010900000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_KEY_AGREEMENT(PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ))
-depends_on:PSA_WANT_ALG_FFDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_FFDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_KEY_AGREEMENT(PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 )):"4c":"505341004b455900000000000100000001100800010000000000000009010109010000004c":0
 
 PSA storage read: alg: PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 ))
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 )):0x0000:"4b":"505341004b455900000000000100000001100800010000000a01020900000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 ))
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 )):"4c":"505341004b45590000000000010000000110080001000000000000000a010209010000004c":0
 
 PSA storage read: alg: PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PRF( PSA_ALG_SHA_256 ))
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_256:PSA_WANT_ALG_TLS12_PRF:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_SHA_256:PSA_WANT_ALG_TLS12_PRF:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PRF( PSA_ALG_SHA_256 )):0x0000:"4b":"505341004b455900000000000100000001100800010000000902020900000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PRF( PSA_ALG_SHA_256 ))
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_256:PSA_WANT_ALG_TLS12_PRF:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_SHA_256:PSA_WANT_ALG_TLS12_PRF:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PRF( PSA_ALG_SHA_256 )):"4c":"505341004b455900000000000100000001100800010000000000000009020209010000004c":0
 
 PSA storage read: alg: PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PRF( PSA_ALG_SHA_384 ))
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_384:PSA_WANT_ALG_TLS12_PRF:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_SHA_384:PSA_WANT_ALG_TLS12_PRF:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PRF( PSA_ALG_SHA_384 )):0x0000:"4b":"505341004b455900000000000100000001100800010000000a02020900000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PRF( PSA_ALG_SHA_384 ))
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_384:PSA_WANT_ALG_TLS12_PRF:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_SHA_384:PSA_WANT_ALG_TLS12_PRF:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PRF( PSA_ALG_SHA_384 )):"4c":"505341004b45590000000000010000000110080001000000000000000a020209010000004c":0
 
 PSA storage read: alg: PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PSK_TO_MS( PSA_ALG_SHA_256 ))
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_256:PSA_WANT_ALG_TLS12_PSK_TO_MS:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_SHA_256:PSA_WANT_ALG_TLS12_PSK_TO_MS:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PSK_TO_MS( PSA_ALG_SHA_256 )):0x0000:"4b":"505341004b455900000000000100000001100800010000000903020900000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PSK_TO_MS( PSA_ALG_SHA_256 ))
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_256:PSA_WANT_ALG_TLS12_PSK_TO_MS:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_SHA_256:PSA_WANT_ALG_TLS12_PSK_TO_MS:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PSK_TO_MS( PSA_ALG_SHA_256 )):"4c":"505341004b455900000000000100000001100800010000000000000009030209010000004c":0
 
 PSA storage read: alg: PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PSK_TO_MS( PSA_ALG_SHA_384 ))
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_384:PSA_WANT_ALG_TLS12_PSK_TO_MS:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_SHA_384:PSA_WANT_ALG_TLS12_PSK_TO_MS:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PSK_TO_MS( PSA_ALG_SHA_384 )):0x0000:"4b":"505341004b455900000000000100000001100800010000000a03020900000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PSK_TO_MS( PSA_ALG_SHA_384 ))
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_384:PSA_WANT_ALG_TLS12_PSK_TO_MS:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_SHA_384:PSA_WANT_ALG_TLS12_PSK_TO_MS:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_TLS12_PSK_TO_MS( PSA_ALG_SHA_384 )):"4c":"505341004b45590000000000010000000110080001000000000000000a030209010000004c":0
 
 PSA storage read: alg: PSA_ALG_KEY_AGREEMENT( PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ) )
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_KEY_AGREEMENT( PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ) ):0x0000:"4b":"505341004b455900000000000100000001100800010000000901020900000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_KEY_AGREEMENT( PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ) )
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_KEY_AGREEMENT( PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ) ):"4c":"505341004b455900000000000100000001100800010000000000000009010209010000004c":0
 
 PSA storage read: alg: PSA_ALG_KEY_AGREEMENT( PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 ) )
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_KEY_AGREEMENT( PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 ) ):0x0000:"4b":"505341004b455900000000000100000001100800010000000a01020900000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_KEY_AGREEMENT( PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 ) )
-depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_KEY_AGREEMENT( PSA_ALG_ECDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 ) ):"4c":"505341004b45590000000000010000000110080001000000000000000a010209010000004c":0
 
 PSA storage read: alg: PSA_ALG_KEY_AGREEMENT( PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ) )
-depends_on:PSA_WANT_ALG_FFDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_FFDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_KEY_AGREEMENT( PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ) ):0x0000:"4b":"505341004b455900000000000100000001100800010000000901010900000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_KEY_AGREEMENT( PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ) )
-depends_on:PSA_WANT_ALG_FFDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_FFDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_KEY_AGREEMENT( PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_256 ) ):"4c":"505341004b455900000000000100000001100800010000000000000009010109010000004c":0
 
 PSA storage read: alg: PSA_ALG_KEY_AGREEMENT( PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 ) )
-depends_on:PSA_WANT_ALG_FFDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_FFDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_KEY_AGREEMENT( PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 ) ):0x0000:"4b":"505341004b455900000000000100000001100800010000000a01010900000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_KEY_AGREEMENT( PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 ) )
-depends_on:PSA_WANT_ALG_FFDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_KEY_AGREEMENT:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_FFDH:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_KEY_AGREEMENT( PSA_ALG_FFDH, PSA_ALG_HKDF( PSA_ALG_SHA_384 ) ):"4c":"505341004b45590000000000010000000110080001000000000000000a010109010000004c":0
 
 PSA storage read: alg: PSA_ALG_MD2
@@ -1577,11 +1577,11 @@
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_RSA_PKCS1V15_SIGN(PSA_ALG_SHA_512):"4c":"505341004b45590000000000010000000110080001000000000000000b020006010000004c":0
 
 PSA storage read: alg: PSA_ALG_RSA_PKCS1V15_SIGN( PSA_ALG_ANY_HASH )
-depends_on:PSA_WANT_ALG_ANY_HASH:PSA_WANT_ALG_RSA_PKCS1V15_SIGN:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_RSA_PKCS1V15_SIGN:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_RSA_PKCS1V15_SIGN( PSA_ALG_ANY_HASH ):0x0000:"4b":"505341004b45590000000000010000000110080001000000ff02000600000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_RSA_PKCS1V15_SIGN( PSA_ALG_ANY_HASH )
-depends_on:PSA_WANT_ALG_ANY_HASH:PSA_WANT_ALG_RSA_PKCS1V15_SIGN:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_RSA_PKCS1V15_SIGN:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_RSA_PKCS1V15_SIGN( PSA_ALG_ANY_HASH ):"4c":"505341004b4559000000000001000000011008000100000000000000ff020006010000004c":0
 
 PSA storage read: alg: PSA_ALG_RSA_PKCS1V15_SIGN( PSA_ALG_SHA_256 )
@@ -1673,11 +1673,11 @@
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_RSA_PSS(PSA_ALG_SHA_512):"4c":"505341004b45590000000000010000000110080001000000000000000b030006010000004c":0
 
 PSA storage read: alg: PSA_ALG_RSA_PSS( PSA_ALG_ANY_HASH )
-depends_on:PSA_WANT_ALG_ANY_HASH:PSA_WANT_ALG_RSA_PSS:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_RSA_PSS:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_RSA_PSS( PSA_ALG_ANY_HASH ):0x0000:"4b":"505341004b45590000000000010000000110080001000000ff03000600000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_RSA_PSS( PSA_ALG_ANY_HASH )
-depends_on:PSA_WANT_ALG_ANY_HASH:PSA_WANT_ALG_RSA_PSS:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_RSA_PSS:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_RSA_PSS( PSA_ALG_ANY_HASH ):"4c":"505341004b4559000000000001000000011008000100000000000000ff030006010000004c":0
 
 PSA storage read: alg: PSA_ALG_RSA_PSS( PSA_ALG_SHA_256 )
@@ -1969,99 +1969,99 @@
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TLS12_PSK_TO_MS( PSA_ALG_SHA_384 ):"4c":"505341004b45590000000000010000000110080001000000000000000a030008010000004c":0
 
 PSA storage read: alg: PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC, 1)
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC, 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000001c10300000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC, 1)
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC, 1):"4c":"505341004b45590000000000010000000110080001000000000000000001c103010000004c":0
 
 PSA storage read: alg: PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC, 1)
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC, 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000002c10300000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC, 1)
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC, 1):"4c":"505341004b45590000000000010000000110080001000000000000000002c103010000004c":0
 
 PSA storage read: alg: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_MD2 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD2:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD2:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_MD2 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000100810300000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_MD2 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD2:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD2:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_MD2 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000001008103010000004c":0
 
 PSA storage read: alg: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_MD4 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD4:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD4:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_MD4 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000200810300000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_MD4 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD4:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD4:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_MD4 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000002008103010000004c":0
 
 PSA storage read: alg: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_MD5 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD5:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD5:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_MD5 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000300810300000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_MD5 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD5:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD5:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_MD5 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000003008103010000004c":0
 
 PSA storage read: alg: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_RIPEMD160 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_RIPEMD160:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_RIPEMD160:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_RIPEMD160 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000400810300000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_RIPEMD160 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_RIPEMD160:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_RIPEMD160:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_RIPEMD160 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000004008103010000004c":0
 
 PSA storage read: alg: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_1 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_1:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_1:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_1 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000500810300000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_1 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_1:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_1:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_1 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000005008103010000004c":0
 
 PSA storage read: alg: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_224 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_224:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_224:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_224 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000800810300000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_224 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_224:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_224:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_224 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000008008103010000004c":0
 
 PSA storage read: alg: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_256 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_256:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_256 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000900810300000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_256 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_256:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_256 ), 1):"4c":"505341004b455900000000000100000001100800010000000000000009008103010000004c":0
 
 PSA storage read: alg: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_384 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_384:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_384 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000a00810300000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_384 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_384:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_384 ), 1):"4c":"505341004b45590000000000010000000110080001000000000000000a008103010000004c":0
 
 PSA storage read: alg: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_512 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_512:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_512:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_512 ), 1):0x0000:"4b":"505341004b455900000000000100000001100800010000000b00810300000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_512 ), 1)
-depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_512:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_SHA_512:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC( PSA_ALG_SHA_512 ), 1):"4c":"505341004b45590000000000010000000110080001000000000000000b008103010000004c":0
 
 PSA storage read: alg: PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC, 63)
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC, 63):0x0000:"4b":"505341004b455900000000000100000001100800010000000001ff0300000000010000004b":0
 
 PSA storage read: alg2: PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC, 63)
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_ALG_TRUNCATED_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
+depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_RAW_DATA
 key_storage_read:0x0001:PSA_KEY_TYPE_RAW_DATA:8:PSA_KEY_USAGE_EXPORT:0x0000:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC, 63):"4c":"505341004b45590000000000010000000110080001000000000000000001ff03010000004c":0
 
 PSA storage read: alg: PSA_ALG_XTS