64-bit block ciphers are incompatible with some modes Only allow selected modes with 64-bit block ciphers (i.e. DES). This removes some storage tests and creates corresponding op_fail tests. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

commit: 4eb1c7e965f675eb12046d270f0d8c359880732b [log] [tgz]
author: Gilles Peskine <Gilles.Peskine@arm.com> Fri Mar 18 10:18:58 2022 +0100
committer: Gilles Peskine <Gilles.Peskine@arm.com> Fri Apr 15 16:15:48 2022 +0200
tree: 5116f7186c700e31930190776af42a9afe0dc951
parent: 0de11438bb90535cd23b98f6f99aff0c54ecb45a [diff]
diff --git a/scripts/mbedtls_dev/crypto_knowledge.py b/scripts/mbedtls_dev/crypto_knowledge.py
index bf6541c..354dee0 100644
--- a/scripts/mbedtls_dev/crypto_knowledge.py
+++ b/scripts/mbedtls_dev/crypto_knowledge.py

@@ -216,6 +216,12 @@
             return False
         if self.head == 'HMAC' and alg.head == 'HMAC':
             return True
+        if self.head == 'DES':
+            # 64-bit block ciphers only allow a reduced set of modes.
+            return alg.head in [
+                'CBC_NO_PADDING', 'CBC_PKCS7',
+                'ECB_NO_PADDING',
+            ]
         if self.head in BLOCK_CIPHERS and \
            alg.head in frozenset.union(BLOCK_MAC_MODES,
                                        BLOCK_CIPHER_MODES,

diff --git a/tests/suites/test_suite_psa_crypto_op_fail.generated.data b/tests/suites/test_suite_psa_crypto_op_fail.generated.data
index 53f06be..81c0b08 100644
--- a/tests/suites/test_suite_psa_crypto_op_fail.generated.data
+++ b/tests/suites/test_suite_psa_crypto_op_fail.generated.data

@@ -512,10 +512,6 @@
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_CAMELLIA
 mac_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,1):PSA_ERROR_INVALID_ARGUMENT
 
-PSA mac AEAD_WITH_SHORTENED_TAG(CCM,1): invalid with DES
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-mac_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,1):PSA_ERROR_INVALID_ARGUMENT
-
 PSA cipher AEAD_WITH_SHORTENED_TAG(CCM,1): invalid with AES
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_AES
 cipher_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,1):PSA_ERROR_INVALID_ARGUMENT
@@ -528,10 +524,6 @@
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_CAMELLIA
 cipher_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,1):PSA_ERROR_INVALID_ARGUMENT
 
-PSA cipher AEAD_WITH_SHORTENED_TAG(CCM,1): invalid with DES
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-cipher_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,1):PSA_ERROR_INVALID_ARGUMENT
-
 PSA aead AEAD_WITH_SHORTENED_TAG(CCM,1): !CCM with AES
 depends_on:!PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_AES
 aead_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,1):PSA_ERROR_NOT_SUPPORTED
@@ -556,9 +548,9 @@
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DERIVE
 aead_fail:PSA_KEY_TYPE_DERIVE:"48657265006973206b6579a0646174":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,1):PSA_ERROR_INVALID_ARGUMENT
 
-PSA aead AEAD_WITH_SHORTENED_TAG(CCM,1): !CCM with DES
-depends_on:!PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-aead_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,1):PSA_ERROR_NOT_SUPPORTED
+PSA aead AEAD_WITH_SHORTENED_TAG(CCM,1): incompatible with DES
+depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
+aead_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,1):PSA_ERROR_INVALID_ARGUMENT
 
 PSA aead AEAD_WITH_SHORTENED_TAG(CCM,1): incompatible with ECC_KEY_PAIR(BRAINPOOL_P_R1)
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_ECC_FAMILY_BRAINPOOL_P_R1:PSA_WANT_KEY_TYPE_ECC_KEY_PAIR
@@ -660,10 +652,6 @@
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_CAMELLIA
 sign_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,1):0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA sign AEAD_WITH_SHORTENED_TAG(CCM,1): invalid with DES
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-sign_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,1):0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA asymmetric_encryption AEAD_WITH_SHORTENED_TAG(CCM,1): invalid with AES
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_AES
 asymmetric_encryption_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,1):0:PSA_ERROR_INVALID_ARGUMENT
@@ -676,10 +664,6 @@
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_CAMELLIA
 asymmetric_encryption_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,1):0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA asymmetric_encryption AEAD_WITH_SHORTENED_TAG(CCM,1): invalid with DES
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-asymmetric_encryption_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,1):0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA key_derivation AEAD_WITH_SHORTENED_TAG(CCM,1): invalid
 depends_on:PSA_WANT_ALG_CCM
 key_derivation_fail:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,1):PSA_ERROR_INVALID_ARGUMENT
@@ -696,10 +680,6 @@
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_CAMELLIA
 key_agreement_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,1):0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA key_agreement AEAD_WITH_SHORTENED_TAG(CCM,1): invalid with DES
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-key_agreement_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,1):0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA hash AEAD_WITH_SHORTENED_TAG(CHACHA20_POLY1305,1): invalid
 depends_on:PSA_WANT_ALG_CHACHA20_POLY1305
 hash_fail:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CHACHA20_POLY1305,1):PSA_ERROR_INVALID_ARGUMENT
@@ -860,10 +840,6 @@
 depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_CAMELLIA
 mac_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM,1):PSA_ERROR_INVALID_ARGUMENT
 
-PSA mac AEAD_WITH_SHORTENED_TAG(GCM,1): invalid with DES
-depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
-mac_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM,1):PSA_ERROR_INVALID_ARGUMENT
-
 PSA cipher AEAD_WITH_SHORTENED_TAG(GCM,1): invalid with AES
 depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_AES
 cipher_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM,1):PSA_ERROR_INVALID_ARGUMENT
@@ -876,10 +852,6 @@
 depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_CAMELLIA
 cipher_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM,1):PSA_ERROR_INVALID_ARGUMENT
 
-PSA cipher AEAD_WITH_SHORTENED_TAG(GCM,1): invalid with DES
-depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
-cipher_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM,1):PSA_ERROR_INVALID_ARGUMENT
-
 PSA aead AEAD_WITH_SHORTENED_TAG(GCM,1): !GCM with AES
 depends_on:!PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_AES
 aead_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM,1):PSA_ERROR_NOT_SUPPORTED
@@ -904,9 +876,9 @@
 depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DERIVE
 aead_fail:PSA_KEY_TYPE_DERIVE:"48657265006973206b6579a0646174":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM,1):PSA_ERROR_INVALID_ARGUMENT
 
-PSA aead AEAD_WITH_SHORTENED_TAG(GCM,1): !GCM with DES
-depends_on:!PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
-aead_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM,1):PSA_ERROR_NOT_SUPPORTED
+PSA aead AEAD_WITH_SHORTENED_TAG(GCM,1): incompatible with DES
+depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
+aead_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM,1):PSA_ERROR_INVALID_ARGUMENT
 
 PSA aead AEAD_WITH_SHORTENED_TAG(GCM,1): incompatible with ECC_KEY_PAIR(BRAINPOOL_P_R1)
 depends_on:PSA_WANT_ALG_GCM:PSA_WANT_ECC_FAMILY_BRAINPOOL_P_R1:PSA_WANT_KEY_TYPE_ECC_KEY_PAIR
@@ -1008,10 +980,6 @@
 depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_CAMELLIA
 sign_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM,1):0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA sign AEAD_WITH_SHORTENED_TAG(GCM,1): invalid with DES
-depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
-sign_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM,1):0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA asymmetric_encryption AEAD_WITH_SHORTENED_TAG(GCM,1): invalid with AES
 depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_AES
 asymmetric_encryption_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM,1):0:PSA_ERROR_INVALID_ARGUMENT
@@ -1024,10 +992,6 @@
 depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_CAMELLIA
 asymmetric_encryption_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM,1):0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA asymmetric_encryption AEAD_WITH_SHORTENED_TAG(GCM,1): invalid with DES
-depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
-asymmetric_encryption_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM,1):0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA key_derivation AEAD_WITH_SHORTENED_TAG(GCM,1): invalid
 depends_on:PSA_WANT_ALG_GCM
 key_derivation_fail:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM,1):PSA_ERROR_INVALID_ARGUMENT
@@ -1044,10 +1008,6 @@
 depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_CAMELLIA
 key_agreement_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM,1):0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA key_agreement AEAD_WITH_SHORTENED_TAG(GCM,1): invalid with DES
-depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
-key_agreement_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM,1):0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA hash AEAD_WITH_SHORTENED_TAG(CCM,63): invalid
 depends_on:PSA_WANT_ALG_CCM
 hash_fail:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,63):PSA_ERROR_INVALID_ARGUMENT
@@ -1064,10 +1024,6 @@
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_CAMELLIA
 mac_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,63):PSA_ERROR_INVALID_ARGUMENT
 
-PSA mac AEAD_WITH_SHORTENED_TAG(CCM,63): invalid with DES
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-mac_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,63):PSA_ERROR_INVALID_ARGUMENT
-
 PSA cipher AEAD_WITH_SHORTENED_TAG(CCM,63): invalid with AES
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_AES
 cipher_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,63):PSA_ERROR_INVALID_ARGUMENT
@@ -1080,10 +1036,6 @@
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_CAMELLIA
 cipher_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,63):PSA_ERROR_INVALID_ARGUMENT
 
-PSA cipher AEAD_WITH_SHORTENED_TAG(CCM,63): invalid with DES
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-cipher_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,63):PSA_ERROR_INVALID_ARGUMENT
-
 PSA aead AEAD_WITH_SHORTENED_TAG(CCM,63): !CCM with AES
 depends_on:!PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_AES
 aead_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,63):PSA_ERROR_NOT_SUPPORTED
@@ -1108,9 +1060,9 @@
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DERIVE
 aead_fail:PSA_KEY_TYPE_DERIVE:"48657265006973206b6579a0646174":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,63):PSA_ERROR_INVALID_ARGUMENT
 
-PSA aead AEAD_WITH_SHORTENED_TAG(CCM,63): !CCM with DES
-depends_on:!PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-aead_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,63):PSA_ERROR_NOT_SUPPORTED
+PSA aead AEAD_WITH_SHORTENED_TAG(CCM,63): incompatible with DES
+depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
+aead_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,63):PSA_ERROR_INVALID_ARGUMENT
 
 PSA aead AEAD_WITH_SHORTENED_TAG(CCM,63): incompatible with ECC_KEY_PAIR(BRAINPOOL_P_R1)
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_ECC_FAMILY_BRAINPOOL_P_R1:PSA_WANT_KEY_TYPE_ECC_KEY_PAIR
@@ -1212,10 +1164,6 @@
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_CAMELLIA
 sign_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,63):0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA sign AEAD_WITH_SHORTENED_TAG(CCM,63): invalid with DES
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-sign_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,63):0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA asymmetric_encryption AEAD_WITH_SHORTENED_TAG(CCM,63): invalid with AES
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_AES
 asymmetric_encryption_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,63):0:PSA_ERROR_INVALID_ARGUMENT
@@ -1228,10 +1176,6 @@
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_CAMELLIA
 asymmetric_encryption_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,63):0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA asymmetric_encryption AEAD_WITH_SHORTENED_TAG(CCM,63): invalid with DES
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-asymmetric_encryption_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,63):0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA key_derivation AEAD_WITH_SHORTENED_TAG(CCM,63): invalid
 depends_on:PSA_WANT_ALG_CCM
 key_derivation_fail:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,63):PSA_ERROR_INVALID_ARGUMENT
@@ -1248,10 +1192,6 @@
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_CAMELLIA
 key_agreement_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,63):0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA key_agreement AEAD_WITH_SHORTENED_TAG(CCM,63): invalid with DES
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-key_agreement_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,63):0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA key_derivation ANY_HASH: invalid
 key_derivation_fail:PSA_ALG_ANY_HASH:PSA_ERROR_INVALID_ARGUMENT
 
@@ -2771,9 +2711,9 @@
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DERIVE
 mac_fail:PSA_KEY_TYPE_DERIVE:"48657265006973206b6579a0646174":PSA_ALG_CBC_MAC:PSA_ERROR_INVALID_ARGUMENT
 
-PSA mac CBC_MAC: !CBC_MAC with DES
-depends_on:!PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-mac_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CBC_MAC:PSA_ERROR_NOT_SUPPORTED
+PSA mac CBC_MAC: incompatible with DES
+depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
+mac_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CBC_MAC:PSA_ERROR_INVALID_ARGUMENT
 
 PSA mac CBC_MAC: incompatible with ECC_KEY_PAIR(BRAINPOOL_P_R1)
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_ECC_FAMILY_BRAINPOOL_P_R1:PSA_WANT_KEY_TYPE_ECC_KEY_PAIR
@@ -2875,10 +2815,6 @@
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_CAMELLIA
 cipher_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CBC_MAC:PSA_ERROR_INVALID_ARGUMENT
 
-PSA cipher CBC_MAC: invalid with DES
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-cipher_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CBC_MAC:PSA_ERROR_INVALID_ARGUMENT
-
 PSA aead CBC_MAC: invalid with AES
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_AES
 aead_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_CBC_MAC:PSA_ERROR_INVALID_ARGUMENT
@@ -2891,10 +2827,6 @@
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_CAMELLIA
 aead_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CBC_MAC:PSA_ERROR_INVALID_ARGUMENT
 
-PSA aead CBC_MAC: invalid with DES
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-aead_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CBC_MAC:PSA_ERROR_INVALID_ARGUMENT
-
 PSA sign CBC_MAC: invalid with AES
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_AES
 sign_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_CBC_MAC:0:PSA_ERROR_INVALID_ARGUMENT
@@ -2907,10 +2839,6 @@
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_CAMELLIA
 sign_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CBC_MAC:0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA sign CBC_MAC: invalid with DES
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-sign_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CBC_MAC:0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA asymmetric_encryption CBC_MAC: invalid with AES
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_AES
 asymmetric_encryption_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_CBC_MAC:0:PSA_ERROR_INVALID_ARGUMENT
@@ -2923,10 +2851,6 @@
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_CAMELLIA
 asymmetric_encryption_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CBC_MAC:0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA asymmetric_encryption CBC_MAC: invalid with DES
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-asymmetric_encryption_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CBC_MAC:0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA key_derivation CBC_MAC: invalid
 depends_on:PSA_WANT_ALG_CBC_MAC
 key_derivation_fail:PSA_ALG_CBC_MAC:PSA_ERROR_INVALID_ARGUMENT
@@ -2943,10 +2867,6 @@
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_CAMELLIA
 key_agreement_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CBC_MAC:0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA key_agreement CBC_MAC: invalid with DES
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-key_agreement_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CBC_MAC:0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA hash CBC_NO_PADDING: invalid
 depends_on:PSA_WANT_ALG_CBC_NO_PADDING
 hash_fail:PSA_ALG_CBC_NO_PADDING:PSA_ERROR_INVALID_ARGUMENT
@@ -3371,10 +3291,6 @@
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_CAMELLIA
 mac_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CCM:PSA_ERROR_INVALID_ARGUMENT
 
-PSA mac CCM: invalid with DES
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-mac_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CCM:PSA_ERROR_INVALID_ARGUMENT
-
 PSA cipher CCM: invalid with AES
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_AES
 cipher_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_CCM:PSA_ERROR_INVALID_ARGUMENT
@@ -3387,10 +3303,6 @@
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_CAMELLIA
 cipher_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CCM:PSA_ERROR_INVALID_ARGUMENT
 
-PSA cipher CCM: invalid with DES
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-cipher_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CCM:PSA_ERROR_INVALID_ARGUMENT
-
 PSA aead CCM: !CCM with AES
 depends_on:!PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_AES
 aead_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_CCM:PSA_ERROR_NOT_SUPPORTED
@@ -3415,9 +3327,9 @@
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DERIVE
 aead_fail:PSA_KEY_TYPE_DERIVE:"48657265006973206b6579a0646174":PSA_ALG_CCM:PSA_ERROR_INVALID_ARGUMENT
 
-PSA aead CCM: !CCM with DES
-depends_on:!PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-aead_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CCM:PSA_ERROR_NOT_SUPPORTED
+PSA aead CCM: incompatible with DES
+depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
+aead_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CCM:PSA_ERROR_INVALID_ARGUMENT
 
 PSA aead CCM: incompatible with ECC_KEY_PAIR(BRAINPOOL_P_R1)
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_ECC_FAMILY_BRAINPOOL_P_R1:PSA_WANT_KEY_TYPE_ECC_KEY_PAIR
@@ -3519,10 +3431,6 @@
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_CAMELLIA
 sign_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CCM:0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA sign CCM: invalid with DES
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-sign_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CCM:0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA asymmetric_encryption CCM: invalid with AES
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_AES
 asymmetric_encryption_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_CCM:0:PSA_ERROR_INVALID_ARGUMENT
@@ -3535,10 +3443,6 @@
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_CAMELLIA
 asymmetric_encryption_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CCM:0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA asymmetric_encryption CCM: invalid with DES
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-asymmetric_encryption_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CCM:0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA key_derivation CCM: invalid
 depends_on:PSA_WANT_ALG_CCM
 key_derivation_fail:PSA_ALG_CCM:PSA_ERROR_INVALID_ARGUMENT
@@ -3555,10 +3459,6 @@
 depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_CAMELLIA
 key_agreement_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CCM:0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA key_agreement CCM: invalid with DES
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-key_agreement_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CCM:0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA hash CFB: invalid
 depends_on:PSA_WANT_ALG_CFB
 hash_fail:PSA_ALG_CFB:PSA_ERROR_INVALID_ARGUMENT
@@ -3575,10 +3475,6 @@
 depends_on:PSA_WANT_ALG_CFB:PSA_WANT_KEY_TYPE_CAMELLIA
 mac_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CFB:PSA_ERROR_INVALID_ARGUMENT
 
-PSA mac CFB: invalid with DES
-depends_on:PSA_WANT_ALG_CFB:PSA_WANT_KEY_TYPE_DES
-mac_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CFB:PSA_ERROR_INVALID_ARGUMENT
-
 PSA cipher CFB: !CFB with AES
 depends_on:!PSA_WANT_ALG_CFB:PSA_WANT_KEY_TYPE_AES
 cipher_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_CFB:PSA_ERROR_NOT_SUPPORTED
@@ -3603,9 +3499,9 @@
 depends_on:PSA_WANT_ALG_CFB:PSA_WANT_KEY_TYPE_DERIVE
 cipher_fail:PSA_KEY_TYPE_DERIVE:"48657265006973206b6579a0646174":PSA_ALG_CFB:PSA_ERROR_INVALID_ARGUMENT
 
-PSA cipher CFB: !CFB with DES
-depends_on:!PSA_WANT_ALG_CFB:PSA_WANT_KEY_TYPE_DES
-cipher_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CFB:PSA_ERROR_NOT_SUPPORTED
+PSA cipher CFB: incompatible with DES
+depends_on:PSA_WANT_ALG_CFB:PSA_WANT_KEY_TYPE_DES
+cipher_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CFB:PSA_ERROR_INVALID_ARGUMENT
 
 PSA cipher CFB: incompatible with ECC_KEY_PAIR(BRAINPOOL_P_R1)
 depends_on:PSA_WANT_ALG_CFB:PSA_WANT_ECC_FAMILY_BRAINPOOL_P_R1:PSA_WANT_KEY_TYPE_ECC_KEY_PAIR
@@ -3707,10 +3603,6 @@
 depends_on:PSA_WANT_ALG_CFB:PSA_WANT_KEY_TYPE_CAMELLIA
 aead_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CFB:PSA_ERROR_INVALID_ARGUMENT
 
-PSA aead CFB: invalid with DES
-depends_on:PSA_WANT_ALG_CFB:PSA_WANT_KEY_TYPE_DES
-aead_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CFB:PSA_ERROR_INVALID_ARGUMENT
-
 PSA sign CFB: invalid with AES
 depends_on:PSA_WANT_ALG_CFB:PSA_WANT_KEY_TYPE_AES
 sign_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_CFB:0:PSA_ERROR_INVALID_ARGUMENT
@@ -3723,10 +3615,6 @@
 depends_on:PSA_WANT_ALG_CFB:PSA_WANT_KEY_TYPE_CAMELLIA
 sign_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CFB:0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA sign CFB: invalid with DES
-depends_on:PSA_WANT_ALG_CFB:PSA_WANT_KEY_TYPE_DES
-sign_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CFB:0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA asymmetric_encryption CFB: invalid with AES
 depends_on:PSA_WANT_ALG_CFB:PSA_WANT_KEY_TYPE_AES
 asymmetric_encryption_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_CFB:0:PSA_ERROR_INVALID_ARGUMENT
@@ -3739,10 +3627,6 @@
 depends_on:PSA_WANT_ALG_CFB:PSA_WANT_KEY_TYPE_CAMELLIA
 asymmetric_encryption_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CFB:0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA asymmetric_encryption CFB: invalid with DES
-depends_on:PSA_WANT_ALG_CFB:PSA_WANT_KEY_TYPE_DES
-asymmetric_encryption_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CFB:0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA key_derivation CFB: invalid
 depends_on:PSA_WANT_ALG_CFB
 key_derivation_fail:PSA_ALG_CFB:PSA_ERROR_INVALID_ARGUMENT
@@ -3759,10 +3643,6 @@
 depends_on:PSA_WANT_ALG_CFB:PSA_WANT_KEY_TYPE_CAMELLIA
 key_agreement_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CFB:0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA key_agreement CFB: invalid with DES
-depends_on:PSA_WANT_ALG_CFB:PSA_WANT_KEY_TYPE_DES
-key_agreement_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CFB:0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA hash CHACHA20_POLY1305: invalid
 depends_on:PSA_WANT_ALG_CHACHA20_POLY1305
 hash_fail:PSA_ALG_CHACHA20_POLY1305:PSA_ERROR_INVALID_ARGUMENT
@@ -3935,9 +3815,9 @@
 depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DERIVE
 mac_fail:PSA_KEY_TYPE_DERIVE:"48657265006973206b6579a0646174":PSA_ALG_CMAC:PSA_ERROR_INVALID_ARGUMENT
 
-PSA mac CMAC: !CMAC with DES
-depends_on:!PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
-mac_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CMAC:PSA_ERROR_NOT_SUPPORTED
+PSA mac CMAC: incompatible with DES
+depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
+mac_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CMAC:PSA_ERROR_INVALID_ARGUMENT
 
 PSA mac CMAC: incompatible with ECC_KEY_PAIR(BRAINPOOL_P_R1)
 depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_ECC_FAMILY_BRAINPOOL_P_R1:PSA_WANT_KEY_TYPE_ECC_KEY_PAIR
@@ -4039,10 +3919,6 @@
 depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_CAMELLIA
 cipher_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CMAC:PSA_ERROR_INVALID_ARGUMENT
 
-PSA cipher CMAC: invalid with DES
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
-cipher_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CMAC:PSA_ERROR_INVALID_ARGUMENT
-
 PSA aead CMAC: invalid with AES
 depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_AES
 aead_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_CMAC:PSA_ERROR_INVALID_ARGUMENT
@@ -4055,10 +3931,6 @@
 depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_CAMELLIA
 aead_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CMAC:PSA_ERROR_INVALID_ARGUMENT
 
-PSA aead CMAC: invalid with DES
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
-aead_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CMAC:PSA_ERROR_INVALID_ARGUMENT
-
 PSA sign CMAC: invalid with AES
 depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_AES
 sign_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_CMAC:0:PSA_ERROR_INVALID_ARGUMENT
@@ -4071,10 +3943,6 @@
 depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_CAMELLIA
 sign_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CMAC:0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA sign CMAC: invalid with DES
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
-sign_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CMAC:0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA asymmetric_encryption CMAC: invalid with AES
 depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_AES
 asymmetric_encryption_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_CMAC:0:PSA_ERROR_INVALID_ARGUMENT
@@ -4087,10 +3955,6 @@
 depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_CAMELLIA
 asymmetric_encryption_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CMAC:0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA asymmetric_encryption CMAC: invalid with DES
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
-asymmetric_encryption_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CMAC:0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA key_derivation CMAC: invalid
 depends_on:PSA_WANT_ALG_CMAC
 key_derivation_fail:PSA_ALG_CMAC:PSA_ERROR_INVALID_ARGUMENT
@@ -4107,10 +3971,6 @@
 depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_CAMELLIA
 key_agreement_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CMAC:0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA key_agreement CMAC: invalid with DES
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
-key_agreement_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CMAC:0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA hash CTR: invalid
 depends_on:PSA_WANT_ALG_CTR
 hash_fail:PSA_ALG_CTR:PSA_ERROR_INVALID_ARGUMENT
@@ -4127,10 +3987,6 @@
 depends_on:PSA_WANT_ALG_CTR:PSA_WANT_KEY_TYPE_CAMELLIA
 mac_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CTR:PSA_ERROR_INVALID_ARGUMENT
 
-PSA mac CTR: invalid with DES
-depends_on:PSA_WANT_ALG_CTR:PSA_WANT_KEY_TYPE_DES
-mac_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CTR:PSA_ERROR_INVALID_ARGUMENT
-
 PSA cipher CTR: !CTR with AES
 depends_on:!PSA_WANT_ALG_CTR:PSA_WANT_KEY_TYPE_AES
 cipher_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_CTR:PSA_ERROR_NOT_SUPPORTED
@@ -4155,9 +4011,9 @@
 depends_on:PSA_WANT_ALG_CTR:PSA_WANT_KEY_TYPE_DERIVE
 cipher_fail:PSA_KEY_TYPE_DERIVE:"48657265006973206b6579a0646174":PSA_ALG_CTR:PSA_ERROR_INVALID_ARGUMENT
 
-PSA cipher CTR: !CTR with DES
-depends_on:!PSA_WANT_ALG_CTR:PSA_WANT_KEY_TYPE_DES
-cipher_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CTR:PSA_ERROR_NOT_SUPPORTED
+PSA cipher CTR: incompatible with DES
+depends_on:PSA_WANT_ALG_CTR:PSA_WANT_KEY_TYPE_DES
+cipher_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CTR:PSA_ERROR_INVALID_ARGUMENT
 
 PSA cipher CTR: incompatible with ECC_KEY_PAIR(BRAINPOOL_P_R1)
 depends_on:PSA_WANT_ALG_CTR:PSA_WANT_ECC_FAMILY_BRAINPOOL_P_R1:PSA_WANT_KEY_TYPE_ECC_KEY_PAIR
@@ -4259,10 +4115,6 @@
 depends_on:PSA_WANT_ALG_CTR:PSA_WANT_KEY_TYPE_CAMELLIA
 aead_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CTR:PSA_ERROR_INVALID_ARGUMENT
 
-PSA aead CTR: invalid with DES
-depends_on:PSA_WANT_ALG_CTR:PSA_WANT_KEY_TYPE_DES
-aead_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CTR:PSA_ERROR_INVALID_ARGUMENT
-
 PSA sign CTR: invalid with AES
 depends_on:PSA_WANT_ALG_CTR:PSA_WANT_KEY_TYPE_AES
 sign_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_CTR:0:PSA_ERROR_INVALID_ARGUMENT
@@ -4275,10 +4127,6 @@
 depends_on:PSA_WANT_ALG_CTR:PSA_WANT_KEY_TYPE_CAMELLIA
 sign_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CTR:0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA sign CTR: invalid with DES
-depends_on:PSA_WANT_ALG_CTR:PSA_WANT_KEY_TYPE_DES
-sign_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CTR:0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA asymmetric_encryption CTR: invalid with AES
 depends_on:PSA_WANT_ALG_CTR:PSA_WANT_KEY_TYPE_AES
 asymmetric_encryption_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_CTR:0:PSA_ERROR_INVALID_ARGUMENT
@@ -4291,10 +4139,6 @@
 depends_on:PSA_WANT_ALG_CTR:PSA_WANT_KEY_TYPE_CAMELLIA
 asymmetric_encryption_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CTR:0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA asymmetric_encryption CTR: invalid with DES
-depends_on:PSA_WANT_ALG_CTR:PSA_WANT_KEY_TYPE_DES
-asymmetric_encryption_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CTR:0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA key_derivation CTR: invalid
 depends_on:PSA_WANT_ALG_CTR
 key_derivation_fail:PSA_ALG_CTR:PSA_ERROR_INVALID_ARGUMENT
@@ -4311,10 +4155,6 @@
 depends_on:PSA_WANT_ALG_CTR:PSA_WANT_KEY_TYPE_CAMELLIA
 key_agreement_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_CTR:0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA key_agreement CTR: invalid with DES
-depends_on:PSA_WANT_ALG_CTR:PSA_WANT_KEY_TYPE_DES
-key_agreement_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_CTR:0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA hash DETERMINISTIC_DSA(MD2): invalid
 depends_on:PSA_WANT_ALG_DETERMINISTIC_DSA:PSA_WANT_ALG_MD2
 hash_fail:PSA_ALG_DETERMINISTIC_DSA(PSA_ALG_MD2):PSA_ERROR_INVALID_ARGUMENT
@@ -17167,10 +17007,6 @@
 depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_CAMELLIA
 mac_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_GCM:PSA_ERROR_INVALID_ARGUMENT
 
-PSA mac GCM: invalid with DES
-depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
-mac_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_GCM:PSA_ERROR_INVALID_ARGUMENT
-
 PSA cipher GCM: invalid with AES
 depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_AES
 cipher_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_GCM:PSA_ERROR_INVALID_ARGUMENT
@@ -17183,10 +17019,6 @@
 depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_CAMELLIA
 cipher_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_GCM:PSA_ERROR_INVALID_ARGUMENT
 
-PSA cipher GCM: invalid with DES
-depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
-cipher_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_GCM:PSA_ERROR_INVALID_ARGUMENT
-
 PSA aead GCM: !GCM with AES
 depends_on:!PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_AES
 aead_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_GCM:PSA_ERROR_NOT_SUPPORTED
@@ -17211,9 +17043,9 @@
 depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DERIVE
 aead_fail:PSA_KEY_TYPE_DERIVE:"48657265006973206b6579a0646174":PSA_ALG_GCM:PSA_ERROR_INVALID_ARGUMENT
 
-PSA aead GCM: !GCM with DES
-depends_on:!PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
-aead_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_GCM:PSA_ERROR_NOT_SUPPORTED
+PSA aead GCM: incompatible with DES
+depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
+aead_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_GCM:PSA_ERROR_INVALID_ARGUMENT
 
 PSA aead GCM: incompatible with ECC_KEY_PAIR(BRAINPOOL_P_R1)
 depends_on:PSA_WANT_ALG_GCM:PSA_WANT_ECC_FAMILY_BRAINPOOL_P_R1:PSA_WANT_KEY_TYPE_ECC_KEY_PAIR
@@ -17315,10 +17147,6 @@
 depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_CAMELLIA
 sign_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_GCM:0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA sign GCM: invalid with DES
-depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
-sign_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_GCM:0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA asymmetric_encryption GCM: invalid with AES
 depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_AES
 asymmetric_encryption_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_GCM:0:PSA_ERROR_INVALID_ARGUMENT
@@ -17331,10 +17159,6 @@
 depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_CAMELLIA
 asymmetric_encryption_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_GCM:0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA asymmetric_encryption GCM: invalid with DES
-depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
-asymmetric_encryption_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_GCM:0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA key_derivation GCM: invalid
 depends_on:PSA_WANT_ALG_GCM
 key_derivation_fail:PSA_ALG_GCM:PSA_ERROR_INVALID_ARGUMENT
@@ -17351,10 +17175,6 @@
 depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_CAMELLIA
 key_agreement_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_GCM:0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA key_agreement GCM: invalid with DES
-depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
-key_agreement_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_GCM:0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA hash HKDF(MD2): invalid
 depends_on:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_MD2
 hash_fail:PSA_ALG_HKDF(PSA_ALG_MD2):PSA_ERROR_INVALID_ARGUMENT
@@ -22771,10 +22591,6 @@
 depends_on:PSA_WANT_ALG_OFB:PSA_WANT_KEY_TYPE_CAMELLIA
 mac_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_OFB:PSA_ERROR_INVALID_ARGUMENT
 
-PSA mac OFB: invalid with DES
-depends_on:PSA_WANT_ALG_OFB:PSA_WANT_KEY_TYPE_DES
-mac_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_OFB:PSA_ERROR_INVALID_ARGUMENT
-
 PSA cipher OFB: !OFB with AES
 depends_on:!PSA_WANT_ALG_OFB:PSA_WANT_KEY_TYPE_AES
 cipher_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_OFB:PSA_ERROR_NOT_SUPPORTED
@@ -22799,9 +22615,9 @@
 depends_on:PSA_WANT_ALG_OFB:PSA_WANT_KEY_TYPE_DERIVE
 cipher_fail:PSA_KEY_TYPE_DERIVE:"48657265006973206b6579a0646174":PSA_ALG_OFB:PSA_ERROR_INVALID_ARGUMENT
 
-PSA cipher OFB: !OFB with DES
-depends_on:!PSA_WANT_ALG_OFB:PSA_WANT_KEY_TYPE_DES
-cipher_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_OFB:PSA_ERROR_NOT_SUPPORTED
+PSA cipher OFB: incompatible with DES
+depends_on:PSA_WANT_ALG_OFB:PSA_WANT_KEY_TYPE_DES
+cipher_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_OFB:PSA_ERROR_INVALID_ARGUMENT
 
 PSA cipher OFB: incompatible with ECC_KEY_PAIR(BRAINPOOL_P_R1)
 depends_on:PSA_WANT_ALG_OFB:PSA_WANT_ECC_FAMILY_BRAINPOOL_P_R1:PSA_WANT_KEY_TYPE_ECC_KEY_PAIR
@@ -22903,10 +22719,6 @@
 depends_on:PSA_WANT_ALG_OFB:PSA_WANT_KEY_TYPE_CAMELLIA
 aead_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_OFB:PSA_ERROR_INVALID_ARGUMENT
 
-PSA aead OFB: invalid with DES
-depends_on:PSA_WANT_ALG_OFB:PSA_WANT_KEY_TYPE_DES
-aead_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_OFB:PSA_ERROR_INVALID_ARGUMENT
-
 PSA sign OFB: invalid with AES
 depends_on:PSA_WANT_ALG_OFB:PSA_WANT_KEY_TYPE_AES
 sign_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_OFB:0:PSA_ERROR_INVALID_ARGUMENT
@@ -22919,10 +22731,6 @@
 depends_on:PSA_WANT_ALG_OFB:PSA_WANT_KEY_TYPE_CAMELLIA
 sign_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_OFB:0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA sign OFB: invalid with DES
-depends_on:PSA_WANT_ALG_OFB:PSA_WANT_KEY_TYPE_DES
-sign_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_OFB:0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA asymmetric_encryption OFB: invalid with AES
 depends_on:PSA_WANT_ALG_OFB:PSA_WANT_KEY_TYPE_AES
 asymmetric_encryption_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_OFB:0:PSA_ERROR_INVALID_ARGUMENT
@@ -22935,10 +22743,6 @@
 depends_on:PSA_WANT_ALG_OFB:PSA_WANT_KEY_TYPE_CAMELLIA
 asymmetric_encryption_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_OFB:0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA asymmetric_encryption OFB: invalid with DES
-depends_on:PSA_WANT_ALG_OFB:PSA_WANT_KEY_TYPE_DES
-asymmetric_encryption_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_OFB:0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA key_derivation OFB: invalid
 depends_on:PSA_WANT_ALG_OFB
 key_derivation_fail:PSA_ALG_OFB:PSA_ERROR_INVALID_ARGUMENT
@@ -22955,10 +22759,6 @@
 depends_on:PSA_WANT_ALG_OFB:PSA_WANT_KEY_TYPE_CAMELLIA
 key_agreement_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_OFB:0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA key_agreement OFB: invalid with DES
-depends_on:PSA_WANT_ALG_OFB:PSA_WANT_KEY_TYPE_DES
-key_agreement_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_OFB:0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA hash PURE_EDDSA: invalid
 depends_on:PSA_WANT_ALG_PURE_EDDSA
 hash_fail:PSA_ALG_PURE_EDDSA:PSA_ERROR_INVALID_ARGUMENT
@@ -30683,9 +30483,9 @@
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DERIVE
 mac_fail:PSA_KEY_TYPE_DERIVE:"48657265006973206b6579a0646174":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,1):PSA_ERROR_INVALID_ARGUMENT
 
-PSA mac TRUNCATED_MAC(CBC_MAC,1): !CBC_MAC with DES
-depends_on:!PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-mac_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,1):PSA_ERROR_NOT_SUPPORTED
+PSA mac TRUNCATED_MAC(CBC_MAC,1): incompatible with DES
+depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
+mac_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,1):PSA_ERROR_INVALID_ARGUMENT
 
 PSA mac TRUNCATED_MAC(CBC_MAC,1): incompatible with ECC_KEY_PAIR(BRAINPOOL_P_R1)
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_ECC_FAMILY_BRAINPOOL_P_R1:PSA_WANT_KEY_TYPE_ECC_KEY_PAIR
@@ -30787,10 +30587,6 @@
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_CAMELLIA
 cipher_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,1):PSA_ERROR_INVALID_ARGUMENT
 
-PSA cipher TRUNCATED_MAC(CBC_MAC,1): invalid with DES
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-cipher_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,1):PSA_ERROR_INVALID_ARGUMENT
-
 PSA aead TRUNCATED_MAC(CBC_MAC,1): invalid with AES
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_AES
 aead_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,1):PSA_ERROR_INVALID_ARGUMENT
@@ -30803,10 +30599,6 @@
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_CAMELLIA
 aead_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,1):PSA_ERROR_INVALID_ARGUMENT
 
-PSA aead TRUNCATED_MAC(CBC_MAC,1): invalid with DES
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-aead_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,1):PSA_ERROR_INVALID_ARGUMENT
-
 PSA sign TRUNCATED_MAC(CBC_MAC,1): invalid with AES
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_AES
 sign_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,1):0:PSA_ERROR_INVALID_ARGUMENT
@@ -30819,10 +30611,6 @@
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_CAMELLIA
 sign_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,1):0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA sign TRUNCATED_MAC(CBC_MAC,1): invalid with DES
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-sign_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,1):0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA asymmetric_encryption TRUNCATED_MAC(CBC_MAC,1): invalid with AES
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_AES
 asymmetric_encryption_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,1):0:PSA_ERROR_INVALID_ARGUMENT
@@ -30835,10 +30623,6 @@
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_CAMELLIA
 asymmetric_encryption_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,1):0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA asymmetric_encryption TRUNCATED_MAC(CBC_MAC,1): invalid with DES
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-asymmetric_encryption_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,1):0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA key_derivation TRUNCATED_MAC(CBC_MAC,1): invalid
 depends_on:PSA_WANT_ALG_CBC_MAC
 key_derivation_fail:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,1):PSA_ERROR_INVALID_ARGUMENT
@@ -30855,10 +30639,6 @@
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_CAMELLIA
 key_agreement_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,1):0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA key_agreement TRUNCATED_MAC(CBC_MAC,1): invalid with DES
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-key_agreement_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,1):0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA hash TRUNCATED_MAC(CMAC,1): invalid
 depends_on:PSA_WANT_ALG_CMAC
 hash_fail:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC,1):PSA_ERROR_INVALID_ARGUMENT
@@ -30887,9 +30667,9 @@
 depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DERIVE
 mac_fail:PSA_KEY_TYPE_DERIVE:"48657265006973206b6579a0646174":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC,1):PSA_ERROR_INVALID_ARGUMENT
 
-PSA mac TRUNCATED_MAC(CMAC,1): !CMAC with DES
-depends_on:!PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
-mac_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC,1):PSA_ERROR_NOT_SUPPORTED
+PSA mac TRUNCATED_MAC(CMAC,1): incompatible with DES
+depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
+mac_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC,1):PSA_ERROR_INVALID_ARGUMENT
 
 PSA mac TRUNCATED_MAC(CMAC,1): incompatible with ECC_KEY_PAIR(BRAINPOOL_P_R1)
 depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_ECC_FAMILY_BRAINPOOL_P_R1:PSA_WANT_KEY_TYPE_ECC_KEY_PAIR
@@ -30991,10 +30771,6 @@
 depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_CAMELLIA
 cipher_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC,1):PSA_ERROR_INVALID_ARGUMENT
 
-PSA cipher TRUNCATED_MAC(CMAC,1): invalid with DES
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
-cipher_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC,1):PSA_ERROR_INVALID_ARGUMENT
-
 PSA aead TRUNCATED_MAC(CMAC,1): invalid with AES
 depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_AES
 aead_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC,1):PSA_ERROR_INVALID_ARGUMENT
@@ -31007,10 +30783,6 @@
 depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_CAMELLIA
 aead_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC,1):PSA_ERROR_INVALID_ARGUMENT
 
-PSA aead TRUNCATED_MAC(CMAC,1): invalid with DES
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
-aead_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC,1):PSA_ERROR_INVALID_ARGUMENT
-
 PSA sign TRUNCATED_MAC(CMAC,1): invalid with AES
 depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_AES
 sign_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC,1):0:PSA_ERROR_INVALID_ARGUMENT
@@ -31023,10 +30795,6 @@
 depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_CAMELLIA
 sign_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC,1):0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA sign TRUNCATED_MAC(CMAC,1): invalid with DES
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
-sign_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC,1):0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA asymmetric_encryption TRUNCATED_MAC(CMAC,1): invalid with AES
 depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_AES
 asymmetric_encryption_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC,1):0:PSA_ERROR_INVALID_ARGUMENT
@@ -31039,10 +30807,6 @@
 depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_CAMELLIA
 asymmetric_encryption_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC,1):0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA asymmetric_encryption TRUNCATED_MAC(CMAC,1): invalid with DES
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
-asymmetric_encryption_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC,1):0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA key_derivation TRUNCATED_MAC(CMAC,1): invalid
 depends_on:PSA_WANT_ALG_CMAC
 key_derivation_fail:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC,1):PSA_ERROR_INVALID_ARGUMENT
@@ -31059,10 +30823,6 @@
 depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_CAMELLIA
 key_agreement_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC,1):0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA key_agreement TRUNCATED_MAC(CMAC,1): invalid with DES
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
-key_agreement_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC,1):0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA hash TRUNCATED_MAC(HMAC(MD2),1): invalid
 depends_on:PSA_WANT_ALG_HMAC:PSA_WANT_ALG_MD2
 hash_fail:PSA_ALG_TRUNCATED_MAC(PSA_ALG_HMAC(PSA_ALG_MD2),1):PSA_ERROR_INVALID_ARGUMENT
@@ -32423,9 +32183,9 @@
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DERIVE
 mac_fail:PSA_KEY_TYPE_DERIVE:"48657265006973206b6579a0646174":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,63):PSA_ERROR_INVALID_ARGUMENT
 
-PSA mac TRUNCATED_MAC(CBC_MAC,63): !CBC_MAC with DES
-depends_on:!PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-mac_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,63):PSA_ERROR_NOT_SUPPORTED
+PSA mac TRUNCATED_MAC(CBC_MAC,63): incompatible with DES
+depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
+mac_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,63):PSA_ERROR_INVALID_ARGUMENT
 
 PSA mac TRUNCATED_MAC(CBC_MAC,63): incompatible with ECC_KEY_PAIR(BRAINPOOL_P_R1)
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_ECC_FAMILY_BRAINPOOL_P_R1:PSA_WANT_KEY_TYPE_ECC_KEY_PAIR
@@ -32527,10 +32287,6 @@
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_CAMELLIA
 cipher_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,63):PSA_ERROR_INVALID_ARGUMENT
 
-PSA cipher TRUNCATED_MAC(CBC_MAC,63): invalid with DES
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-cipher_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,63):PSA_ERROR_INVALID_ARGUMENT
-
 PSA aead TRUNCATED_MAC(CBC_MAC,63): invalid with AES
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_AES
 aead_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,63):PSA_ERROR_INVALID_ARGUMENT
@@ -32543,10 +32299,6 @@
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_CAMELLIA
 aead_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,63):PSA_ERROR_INVALID_ARGUMENT
 
-PSA aead TRUNCATED_MAC(CBC_MAC,63): invalid with DES
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-aead_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,63):PSA_ERROR_INVALID_ARGUMENT
-
 PSA sign TRUNCATED_MAC(CBC_MAC,63): invalid with AES
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_AES
 sign_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,63):0:PSA_ERROR_INVALID_ARGUMENT
@@ -32559,10 +32311,6 @@
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_CAMELLIA
 sign_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,63):0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA sign TRUNCATED_MAC(CBC_MAC,63): invalid with DES
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-sign_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,63):0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA asymmetric_encryption TRUNCATED_MAC(CBC_MAC,63): invalid with AES
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_AES
 asymmetric_encryption_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,63):0:PSA_ERROR_INVALID_ARGUMENT
@@ -32575,10 +32323,6 @@
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_CAMELLIA
 asymmetric_encryption_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,63):0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA asymmetric_encryption TRUNCATED_MAC(CBC_MAC,63): invalid with DES
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-asymmetric_encryption_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,63):0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA key_derivation TRUNCATED_MAC(CBC_MAC,63): invalid
 depends_on:PSA_WANT_ALG_CBC_MAC
 key_derivation_fail:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,63):PSA_ERROR_INVALID_ARGUMENT
@@ -32595,10 +32339,6 @@
 depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_CAMELLIA
 key_agreement_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,63):0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA key_agreement TRUNCATED_MAC(CBC_MAC,63): invalid with DES
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-key_agreement_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,63):0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA hash XTS: invalid
 depends_on:PSA_WANT_ALG_XTS
 hash_fail:PSA_ALG_XTS:PSA_ERROR_INVALID_ARGUMENT
@@ -32615,10 +32355,6 @@
 depends_on:PSA_WANT_ALG_XTS:PSA_WANT_KEY_TYPE_CAMELLIA
 mac_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_XTS:PSA_ERROR_INVALID_ARGUMENT
 
-PSA mac XTS: invalid with DES
-depends_on:PSA_WANT_ALG_XTS:PSA_WANT_KEY_TYPE_DES
-mac_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_XTS:PSA_ERROR_INVALID_ARGUMENT
-
 PSA cipher XTS: !XTS with AES
 depends_on:!PSA_WANT_ALG_XTS:PSA_WANT_KEY_TYPE_AES
 cipher_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_XTS:PSA_ERROR_NOT_SUPPORTED
@@ -32643,9 +32379,9 @@
 depends_on:PSA_WANT_ALG_XTS:PSA_WANT_KEY_TYPE_DERIVE
 cipher_fail:PSA_KEY_TYPE_DERIVE:"48657265006973206b6579a0646174":PSA_ALG_XTS:PSA_ERROR_INVALID_ARGUMENT
 
-PSA cipher XTS: !XTS with DES
-depends_on:!PSA_WANT_ALG_XTS:PSA_WANT_KEY_TYPE_DES
-cipher_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_XTS:PSA_ERROR_NOT_SUPPORTED
+PSA cipher XTS: incompatible with DES
+depends_on:PSA_WANT_ALG_XTS:PSA_WANT_KEY_TYPE_DES
+cipher_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_XTS:PSA_ERROR_INVALID_ARGUMENT
 
 PSA cipher XTS: incompatible with ECC_KEY_PAIR(BRAINPOOL_P_R1)
 depends_on:PSA_WANT_ALG_XTS:PSA_WANT_ECC_FAMILY_BRAINPOOL_P_R1:PSA_WANT_KEY_TYPE_ECC_KEY_PAIR
@@ -32747,10 +32483,6 @@
 depends_on:PSA_WANT_ALG_XTS:PSA_WANT_KEY_TYPE_CAMELLIA
 aead_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_XTS:PSA_ERROR_INVALID_ARGUMENT
 
-PSA aead XTS: invalid with DES
-depends_on:PSA_WANT_ALG_XTS:PSA_WANT_KEY_TYPE_DES
-aead_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_XTS:PSA_ERROR_INVALID_ARGUMENT
-
 PSA sign XTS: invalid with AES
 depends_on:PSA_WANT_ALG_XTS:PSA_WANT_KEY_TYPE_AES
 sign_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_XTS:0:PSA_ERROR_INVALID_ARGUMENT
@@ -32763,10 +32495,6 @@
 depends_on:PSA_WANT_ALG_XTS:PSA_WANT_KEY_TYPE_CAMELLIA
 sign_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_XTS:0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA sign XTS: invalid with DES
-depends_on:PSA_WANT_ALG_XTS:PSA_WANT_KEY_TYPE_DES
-sign_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_XTS:0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA asymmetric_encryption XTS: invalid with AES
 depends_on:PSA_WANT_ALG_XTS:PSA_WANT_KEY_TYPE_AES
 asymmetric_encryption_fail:PSA_KEY_TYPE_AES:"48657265006973206b6579a064617461":PSA_ALG_XTS:0:PSA_ERROR_INVALID_ARGUMENT
@@ -32779,10 +32507,6 @@
 depends_on:PSA_WANT_ALG_XTS:PSA_WANT_KEY_TYPE_CAMELLIA
 asymmetric_encryption_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_XTS:0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA asymmetric_encryption XTS: invalid with DES
-depends_on:PSA_WANT_ALG_XTS:PSA_WANT_KEY_TYPE_DES
-asymmetric_encryption_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_XTS:0:PSA_ERROR_INVALID_ARGUMENT
-
 PSA key_derivation XTS: invalid
 depends_on:PSA_WANT_ALG_XTS
 key_derivation_fail:PSA_ALG_XTS:PSA_ERROR_INVALID_ARGUMENT
@@ -32799,8 +32523,4 @@
 depends_on:PSA_WANT_ALG_XTS:PSA_WANT_KEY_TYPE_CAMELLIA
 key_agreement_fail:PSA_KEY_TYPE_CAMELLIA:"48657265006973206b6579a064617461":PSA_ALG_XTS:0:PSA_ERROR_INVALID_ARGUMENT
 
-PSA key_agreement XTS: invalid with DES
-depends_on:PSA_WANT_ALG_XTS:PSA_WANT_KEY_TYPE_DES
-key_agreement_fail:PSA_KEY_TYPE_DES:"644573206b457901":PSA_ALG_XTS:0:PSA_ERROR_INVALID_ARGUMENT
-
 # End of automatically generated file.

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 4ccc925..b24fa77 100644
--- a/tests/suites/test_suite_psa_crypto_storage_format.current.data
+++ b/tests/suites/test_suite_psa_crypto_storage_format.current.data

@@ -796,22 +796,6 @@
 depends_on:PSA_WANT_KEY_TYPE_DES
 key_storage_save:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_EXPORT:0x0000:0x0000:"644573206b457901":"505341004b45590000000000010000000123400001000000000000000000000008000000644573206b457901"
 
-save type: DES 64-bit, AEAD_SHORT(CCM,1)
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,1):0x0000:"644573206b457901":"505341004b45590000000000010000000123400001030000000141050000000008000000644573206b457901"
-
-save type: DES 64-bit, AEAD_SHORT(GCM,1)
-depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM,1):0x0000:"644573206b457901":"505341004b45590000000000010000000123400001030000000241050000000008000000644573206b457901"
-
-save type: DES 64-bit, AEAD_SHORT(CCM,63)
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,63):0x0000:"644573206b457901":"505341004b4559000000000001000000012340000103000000017f050000000008000000644573206b457901"
-
-save type: DES 64-bit, CBC_MAC
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_CBC_MAC:0x0000:"644573206b457901":"505341004b455900000000000100000001234000013c00000001c0030000000008000000644573206b457901"
-
 save type: DES 64-bit, CBC_NO_PADDING
 depends_on:PSA_WANT_ALG_CBC_NO_PADDING:PSA_WANT_KEY_TYPE_DES
 key_storage_save:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CBC_NO_PADDING:0x0000:"644573206b457901":"505341004b45590000000000010000000123400001030000004040040000000008000000644573206b457901"
@@ -820,70 +804,14 @@
 depends_on:PSA_WANT_ALG_CBC_PKCS7:PSA_WANT_KEY_TYPE_DES
 key_storage_save:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CBC_PKCS7:0x0000:"644573206b457901":"505341004b45590000000000010000000123400001030000004140040000000008000000644573206b457901"
 
-save type: DES 64-bit, CCM
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CCM:0x0000:"644573206b457901":"505341004b45590000000000010000000123400001030000000150050000000008000000644573206b457901"
-
-save type: DES 64-bit, CFB
-depends_on:PSA_WANT_ALG_CFB:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CFB:0x0000:"644573206b457901":"505341004b455900000000000100000001234000010300000011c0040000000008000000644573206b457901"
-
-save type: DES 64-bit, CMAC
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_CMAC:0x0000:"644573206b457901":"505341004b455900000000000100000001234000013c00000002c0030000000008000000644573206b457901"
-
-save type: DES 64-bit, CTR
-depends_on:PSA_WANT_ALG_CTR:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CTR:0x0000:"644573206b457901":"505341004b455900000000000100000001234000010300000010c0040000000008000000644573206b457901"
-
 save type: DES 64-bit, ECB_NO_PADDING
 depends_on:PSA_WANT_ALG_ECB_NO_PADDING:PSA_WANT_KEY_TYPE_DES
 key_storage_save:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_ECB_NO_PADDING:0x0000:"644573206b457901":"505341004b45590000000000010000000123400001030000004440040000000008000000644573206b457901"
 
-save type: DES 64-bit, GCM
-depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_GCM:0x0000:"644573206b457901":"505341004b45590000000000010000000123400001030000000250050000000008000000644573206b457901"
-
-save type: DES 64-bit, OFB
-depends_on:PSA_WANT_ALG_OFB:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_OFB:0x0000:"644573206b457901":"505341004b455900000000000100000001234000010300000012c0040000000008000000644573206b457901"
-
-save type: DES 64-bit, TRUNCATED_MAC(CBC_MAC,1)
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,1):0x0000:"644573206b457901":"505341004b455900000000000100000001234000013c00000001c1030000000008000000644573206b457901"
-
-save type: DES 64-bit, TRUNCATED_MAC(CMAC,1)
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC,1):0x0000:"644573206b457901":"505341004b455900000000000100000001234000013c00000002c1030000000008000000644573206b457901"
-
-save type: DES 64-bit, TRUNCATED_MAC(CBC_MAC,63)
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,63):0x0000:"644573206b457901":"505341004b455900000000000100000001234000013c00000001ff030000000008000000644573206b457901"
-
-save type: DES 64-bit, XTS
-depends_on:PSA_WANT_ALG_XTS:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_XTS:0x0000:"644573206b457901":"505341004b4559000000000001000000012340000103000000ff40040000000008000000644573206b457901"
-
 save type: DES 128-bit
 depends_on:PSA_WANT_KEY_TYPE_DES
 key_storage_save:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_EXPORT:0x0000:0x0000:"644573206b457901644573206b457902":"505341004b45590000000000010000000123800001000000000000000000000010000000644573206b457901644573206b457902"
 
-save type: DES 128-bit, AEAD_SHORT(CCM,1)
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,1):0x0000:"644573206b457901644573206b457902":"505341004b45590000000000010000000123800001030000000141050000000010000000644573206b457901644573206b457902"
-
-save type: DES 128-bit, AEAD_SHORT(GCM,1)
-depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM,1):0x0000:"644573206b457901644573206b457902":"505341004b45590000000000010000000123800001030000000241050000000010000000644573206b457901644573206b457902"
-
-save type: DES 128-bit, AEAD_SHORT(CCM,63)
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,63):0x0000:"644573206b457901644573206b457902":"505341004b4559000000000001000000012380000103000000017f050000000010000000644573206b457901644573206b457902"
-
-save type: DES 128-bit, CBC_MAC
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_CBC_MAC:0x0000:"644573206b457901644573206b457902":"505341004b455900000000000100000001238000013c00000001c0030000000010000000644573206b457901644573206b457902"
-
 save type: DES 128-bit, CBC_NO_PADDING
 depends_on:PSA_WANT_ALG_CBC_NO_PADDING:PSA_WANT_KEY_TYPE_DES
 key_storage_save:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CBC_NO_PADDING:0x0000:"644573206b457901644573206b457902":"505341004b45590000000000010000000123800001030000004040040000000010000000644573206b457901644573206b457902"
@@ -892,70 +820,14 @@
 depends_on:PSA_WANT_ALG_CBC_PKCS7:PSA_WANT_KEY_TYPE_DES
 key_storage_save:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CBC_PKCS7:0x0000:"644573206b457901644573206b457902":"505341004b45590000000000010000000123800001030000004140040000000010000000644573206b457901644573206b457902"
 
-save type: DES 128-bit, CCM
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CCM:0x0000:"644573206b457901644573206b457902":"505341004b45590000000000010000000123800001030000000150050000000010000000644573206b457901644573206b457902"
-
-save type: DES 128-bit, CFB
-depends_on:PSA_WANT_ALG_CFB:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CFB:0x0000:"644573206b457901644573206b457902":"505341004b455900000000000100000001238000010300000011c0040000000010000000644573206b457901644573206b457902"
-
-save type: DES 128-bit, CMAC
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_CMAC:0x0000:"644573206b457901644573206b457902":"505341004b455900000000000100000001238000013c00000002c0030000000010000000644573206b457901644573206b457902"
-
-save type: DES 128-bit, CTR
-depends_on:PSA_WANT_ALG_CTR:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CTR:0x0000:"644573206b457901644573206b457902":"505341004b455900000000000100000001238000010300000010c0040000000010000000644573206b457901644573206b457902"
-
 save type: DES 128-bit, ECB_NO_PADDING
 depends_on:PSA_WANT_ALG_ECB_NO_PADDING:PSA_WANT_KEY_TYPE_DES
 key_storage_save:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_ECB_NO_PADDING:0x0000:"644573206b457901644573206b457902":"505341004b45590000000000010000000123800001030000004440040000000010000000644573206b457901644573206b457902"
 
-save type: DES 128-bit, GCM
-depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_GCM:0x0000:"644573206b457901644573206b457902":"505341004b45590000000000010000000123800001030000000250050000000010000000644573206b457901644573206b457902"
-
-save type: DES 128-bit, OFB
-depends_on:PSA_WANT_ALG_OFB:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_OFB:0x0000:"644573206b457901644573206b457902":"505341004b455900000000000100000001238000010300000012c0040000000010000000644573206b457901644573206b457902"
-
-save type: DES 128-bit, TRUNCATED_MAC(CBC_MAC,1)
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,1):0x0000:"644573206b457901644573206b457902":"505341004b455900000000000100000001238000013c00000001c1030000000010000000644573206b457901644573206b457902"
-
-save type: DES 128-bit, TRUNCATED_MAC(CMAC,1)
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC,1):0x0000:"644573206b457901644573206b457902":"505341004b455900000000000100000001238000013c00000002c1030000000010000000644573206b457901644573206b457902"
-
-save type: DES 128-bit, TRUNCATED_MAC(CBC_MAC,63)
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,63):0x0000:"644573206b457901644573206b457902":"505341004b455900000000000100000001238000013c00000001ff030000000010000000644573206b457901644573206b457902"
-
-save type: DES 128-bit, XTS
-depends_on:PSA_WANT_ALG_XTS:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_XTS:0x0000:"644573206b457901644573206b457902":"505341004b4559000000000001000000012380000103000000ff40040000000010000000644573206b457901644573206b457902"
-
 save type: DES 192-bit
 depends_on:PSA_WANT_KEY_TYPE_DES
 key_storage_save:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_EXPORT:0x0000:0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c00001000000000000000000000018000000644573206b457901644573206b457902644573206b457904"
 
-save type: DES 192-bit, AEAD_SHORT(CCM,1)
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,1):0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c00001030000000141050000000018000000644573206b457901644573206b457902644573206b457904"
-
-save type: DES 192-bit, AEAD_SHORT(GCM,1)
-depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM,1):0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c00001030000000241050000000018000000644573206b457901644573206b457902644573206b457904"
-
-save type: DES 192-bit, AEAD_SHORT(CCM,63)
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,63):0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c0000103000000017f050000000018000000644573206b457901644573206b457902644573206b457904"
-
-save type: DES 192-bit, CBC_MAC
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_CBC_MAC:0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c000013c00000001c0030000000018000000644573206b457901644573206b457902644573206b457904"
-
 save type: DES 192-bit, CBC_NO_PADDING
 depends_on:PSA_WANT_ALG_CBC_NO_PADDING:PSA_WANT_KEY_TYPE_DES
 key_storage_save:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CBC_NO_PADDING:0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c00001030000004040040000000018000000644573206b457901644573206b457902644573206b457904"
@@ -964,50 +836,10 @@
 depends_on:PSA_WANT_ALG_CBC_PKCS7:PSA_WANT_KEY_TYPE_DES
 key_storage_save:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CBC_PKCS7:0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c00001030000004140040000000018000000644573206b457901644573206b457902644573206b457904"
 
-save type: DES 192-bit, CCM
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CCM:0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c00001030000000150050000000018000000644573206b457901644573206b457902644573206b457904"
-
-save type: DES 192-bit, CFB
-depends_on:PSA_WANT_ALG_CFB:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CFB:0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c000010300000011c0040000000018000000644573206b457901644573206b457902644573206b457904"
-
-save type: DES 192-bit, CMAC
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_CMAC:0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c000013c00000002c0030000000018000000644573206b457901644573206b457902644573206b457904"
-
-save type: DES 192-bit, CTR
-depends_on:PSA_WANT_ALG_CTR:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CTR:0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c000010300000010c0040000000018000000644573206b457901644573206b457902644573206b457904"
-
 save type: DES 192-bit, ECB_NO_PADDING
 depends_on:PSA_WANT_ALG_ECB_NO_PADDING:PSA_WANT_KEY_TYPE_DES
 key_storage_save:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_ECB_NO_PADDING:0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c00001030000004440040000000018000000644573206b457901644573206b457902644573206b457904"
 
-save type: DES 192-bit, GCM
-depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_GCM:0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c00001030000000250050000000018000000644573206b457901644573206b457902644573206b457904"
-
-save type: DES 192-bit, OFB
-depends_on:PSA_WANT_ALG_OFB:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_OFB:0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c000010300000012c0040000000018000000644573206b457901644573206b457902644573206b457904"
-
-save type: DES 192-bit, TRUNCATED_MAC(CBC_MAC,1)
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,1):0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c000013c00000001c1030000000018000000644573206b457901644573206b457902644573206b457904"
-
-save type: DES 192-bit, TRUNCATED_MAC(CMAC,1)
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC,1):0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c000013c00000002c1030000000018000000644573206b457901644573206b457902644573206b457904"
-
-save type: DES 192-bit, TRUNCATED_MAC(CBC_MAC,63)
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,63):0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c000013c00000001ff030000000018000000644573206b457901644573206b457902644573206b457904"
-
-save type: DES 192-bit, XTS
-depends_on:PSA_WANT_ALG_XTS:PSA_WANT_KEY_TYPE_DES
-key_storage_save:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_XTS:0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c0000103000000ff40040000000018000000644573206b457901644573206b457902644573206b457904"
-
 save type: ECC_PAIR(BP_R1) 160-bit
 depends_on:PSA_WANT_ECC_BRAINPOOL_P_R1_160:PSA_WANT_KEY_TYPE_ECC_KEY_PAIR
 key_storage_save:0x0001:PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_FAMILY_BRAINPOOL_P_R1):160:PSA_KEY_USAGE_EXPORT:0x0000:0x0000:"69502c4fdaf48d4fa617bdd24498b0406d0eeaac":"505341004b45590000000000010000003071a0000100000000000000000000001400000069502c4fdaf48d4fa617bdd24498b0406d0eeaac"

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 869eaa4..21f606d 100644
--- a/tests/suites/test_suite_psa_crypto_storage_format.v0.data
+++ b/tests/suites/test_suite_psa_crypto_storage_format.v0.data

@@ -876,22 +876,6 @@
 depends_on:PSA_WANT_KEY_TYPE_DES
 key_storage_read:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_EXPORT:0x0000:0x0000:"644573206b457901":"505341004b45590000000000010000000123400001000000000000000000000008000000644573206b457901":TEST_FLAG_EXERCISE
 
-read type: DES 64-bit, AEAD_SHORT(CCM,1)
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,1):0x0000:"644573206b457901":"505341004b45590000000000010000000123400001030000000141050000000008000000644573206b457901":TEST_FLAG_EXERCISE
-
-read type: DES 64-bit, AEAD_SHORT(GCM,1)
-depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM,1):0x0000:"644573206b457901":"505341004b45590000000000010000000123400001030000000241050000000008000000644573206b457901":TEST_FLAG_EXERCISE
-
-read type: DES 64-bit, AEAD_SHORT(CCM,63)
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,63):0x0000:"644573206b457901":"505341004b4559000000000001000000012340000103000000017f050000000008000000644573206b457901":TEST_FLAG_EXERCISE
-
-read type: DES 64-bit, CBC_MAC
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_CBC_MAC:0x0000:"644573206b457901":"505341004b455900000000000100000001234000013c00000001c0030000000008000000644573206b457901":TEST_FLAG_EXERCISE
-
 read type: DES 64-bit, CBC_NO_PADDING
 depends_on:PSA_WANT_ALG_CBC_NO_PADDING:PSA_WANT_KEY_TYPE_DES
 key_storage_read:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CBC_NO_PADDING:0x0000:"644573206b457901":"505341004b45590000000000010000000123400001030000004040040000000008000000644573206b457901":TEST_FLAG_EXERCISE
@@ -900,70 +884,14 @@
 depends_on:PSA_WANT_ALG_CBC_PKCS7:PSA_WANT_KEY_TYPE_DES
 key_storage_read:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CBC_PKCS7:0x0000:"644573206b457901":"505341004b45590000000000010000000123400001030000004140040000000008000000644573206b457901":TEST_FLAG_EXERCISE
 
-read type: DES 64-bit, CCM
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CCM:0x0000:"644573206b457901":"505341004b45590000000000010000000123400001030000000150050000000008000000644573206b457901":TEST_FLAG_EXERCISE
-
-read type: DES 64-bit, CFB
-depends_on:PSA_WANT_ALG_CFB:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CFB:0x0000:"644573206b457901":"505341004b455900000000000100000001234000010300000011c0040000000008000000644573206b457901":TEST_FLAG_EXERCISE
-
-read type: DES 64-bit, CMAC
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_CMAC:0x0000:"644573206b457901":"505341004b455900000000000100000001234000013c00000002c0030000000008000000644573206b457901":TEST_FLAG_EXERCISE
-
-read type: DES 64-bit, CTR
-depends_on:PSA_WANT_ALG_CTR:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CTR:0x0000:"644573206b457901":"505341004b455900000000000100000001234000010300000010c0040000000008000000644573206b457901":TEST_FLAG_EXERCISE
-
 read type: DES 64-bit, ECB_NO_PADDING
 depends_on:PSA_WANT_ALG_ECB_NO_PADDING:PSA_WANT_KEY_TYPE_DES
 key_storage_read:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_ECB_NO_PADDING:0x0000:"644573206b457901":"505341004b45590000000000010000000123400001030000004440040000000008000000644573206b457901":TEST_FLAG_EXERCISE
 
-read type: DES 64-bit, GCM
-depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_GCM:0x0000:"644573206b457901":"505341004b45590000000000010000000123400001030000000250050000000008000000644573206b457901":TEST_FLAG_EXERCISE
-
-read type: DES 64-bit, OFB
-depends_on:PSA_WANT_ALG_OFB:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_OFB:0x0000:"644573206b457901":"505341004b455900000000000100000001234000010300000012c0040000000008000000644573206b457901":TEST_FLAG_EXERCISE
-
-read type: DES 64-bit, TRUNCATED_MAC(CBC_MAC,1)
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,1):0x0000:"644573206b457901":"505341004b455900000000000100000001234000013c00000001c1030000000008000000644573206b457901":TEST_FLAG_EXERCISE
-
-read type: DES 64-bit, TRUNCATED_MAC(CMAC,1)
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC,1):0x0000:"644573206b457901":"505341004b455900000000000100000001234000013c00000002c1030000000008000000644573206b457901":TEST_FLAG_EXERCISE
-
-read type: DES 64-bit, TRUNCATED_MAC(CBC_MAC,63)
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,63):0x0000:"644573206b457901":"505341004b455900000000000100000001234000013c00000001ff030000000008000000644573206b457901":TEST_FLAG_EXERCISE
-
-read type: DES 64-bit, XTS
-depends_on:PSA_WANT_ALG_XTS:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:64:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_XTS:0x0000:"644573206b457901":"505341004b4559000000000001000000012340000103000000ff40040000000008000000644573206b457901":TEST_FLAG_EXERCISE
-
 read type: DES 128-bit
 depends_on:PSA_WANT_KEY_TYPE_DES
 key_storage_read:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_EXPORT:0x0000:0x0000:"644573206b457901644573206b457902":"505341004b45590000000000010000000123800001000000000000000000000010000000644573206b457901644573206b457902":TEST_FLAG_EXERCISE
 
-read type: DES 128-bit, AEAD_SHORT(CCM,1)
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,1):0x0000:"644573206b457901644573206b457902":"505341004b45590000000000010000000123800001030000000141050000000010000000644573206b457901644573206b457902":TEST_FLAG_EXERCISE
-
-read type: DES 128-bit, AEAD_SHORT(GCM,1)
-depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM,1):0x0000:"644573206b457901644573206b457902":"505341004b45590000000000010000000123800001030000000241050000000010000000644573206b457901644573206b457902":TEST_FLAG_EXERCISE
-
-read type: DES 128-bit, AEAD_SHORT(CCM,63)
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,63):0x0000:"644573206b457901644573206b457902":"505341004b4559000000000001000000012380000103000000017f050000000010000000644573206b457901644573206b457902":TEST_FLAG_EXERCISE
-
-read type: DES 128-bit, CBC_MAC
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_CBC_MAC:0x0000:"644573206b457901644573206b457902":"505341004b455900000000000100000001238000013c00000001c0030000000010000000644573206b457901644573206b457902":TEST_FLAG_EXERCISE
-
 read type: DES 128-bit, CBC_NO_PADDING
 depends_on:PSA_WANT_ALG_CBC_NO_PADDING:PSA_WANT_KEY_TYPE_DES
 key_storage_read:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CBC_NO_PADDING:0x0000:"644573206b457901644573206b457902":"505341004b45590000000000010000000123800001030000004040040000000010000000644573206b457901644573206b457902":TEST_FLAG_EXERCISE
@@ -972,70 +900,14 @@
 depends_on:PSA_WANT_ALG_CBC_PKCS7:PSA_WANT_KEY_TYPE_DES
 key_storage_read:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CBC_PKCS7:0x0000:"644573206b457901644573206b457902":"505341004b45590000000000010000000123800001030000004140040000000010000000644573206b457901644573206b457902":TEST_FLAG_EXERCISE
 
-read type: DES 128-bit, CCM
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CCM:0x0000:"644573206b457901644573206b457902":"505341004b45590000000000010000000123800001030000000150050000000010000000644573206b457901644573206b457902":TEST_FLAG_EXERCISE
-
-read type: DES 128-bit, CFB
-depends_on:PSA_WANT_ALG_CFB:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CFB:0x0000:"644573206b457901644573206b457902":"505341004b455900000000000100000001238000010300000011c0040000000010000000644573206b457901644573206b457902":TEST_FLAG_EXERCISE
-
-read type: DES 128-bit, CMAC
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_CMAC:0x0000:"644573206b457901644573206b457902":"505341004b455900000000000100000001238000013c00000002c0030000000010000000644573206b457901644573206b457902":TEST_FLAG_EXERCISE
-
-read type: DES 128-bit, CTR
-depends_on:PSA_WANT_ALG_CTR:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CTR:0x0000:"644573206b457901644573206b457902":"505341004b455900000000000100000001238000010300000010c0040000000010000000644573206b457901644573206b457902":TEST_FLAG_EXERCISE
-
 read type: DES 128-bit, ECB_NO_PADDING
 depends_on:PSA_WANT_ALG_ECB_NO_PADDING:PSA_WANT_KEY_TYPE_DES
 key_storage_read:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_ECB_NO_PADDING:0x0000:"644573206b457901644573206b457902":"505341004b45590000000000010000000123800001030000004440040000000010000000644573206b457901644573206b457902":TEST_FLAG_EXERCISE
 
-read type: DES 128-bit, GCM
-depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_GCM:0x0000:"644573206b457901644573206b457902":"505341004b45590000000000010000000123800001030000000250050000000010000000644573206b457901644573206b457902":TEST_FLAG_EXERCISE
-
-read type: DES 128-bit, OFB
-depends_on:PSA_WANT_ALG_OFB:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_OFB:0x0000:"644573206b457901644573206b457902":"505341004b455900000000000100000001238000010300000012c0040000000010000000644573206b457901644573206b457902":TEST_FLAG_EXERCISE
-
-read type: DES 128-bit, TRUNCATED_MAC(CBC_MAC,1)
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,1):0x0000:"644573206b457901644573206b457902":"505341004b455900000000000100000001238000013c00000001c1030000000010000000644573206b457901644573206b457902":TEST_FLAG_EXERCISE
-
-read type: DES 128-bit, TRUNCATED_MAC(CMAC,1)
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC,1):0x0000:"644573206b457901644573206b457902":"505341004b455900000000000100000001238000013c00000002c1030000000010000000644573206b457901644573206b457902":TEST_FLAG_EXERCISE
-
-read type: DES 128-bit, TRUNCATED_MAC(CBC_MAC,63)
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,63):0x0000:"644573206b457901644573206b457902":"505341004b455900000000000100000001238000013c00000001ff030000000010000000644573206b457901644573206b457902":TEST_FLAG_EXERCISE
-
-read type: DES 128-bit, XTS
-depends_on:PSA_WANT_ALG_XTS:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:128:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_XTS:0x0000:"644573206b457901644573206b457902":"505341004b4559000000000001000000012380000103000000ff40040000000010000000644573206b457901644573206b457902":TEST_FLAG_EXERCISE
-
 read type: DES 192-bit
 depends_on:PSA_WANT_KEY_TYPE_DES
 key_storage_read:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_EXPORT:0x0000:0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c00001000000000000000000000018000000644573206b457901644573206b457902644573206b457904":TEST_FLAG_EXERCISE
 
-read type: DES 192-bit, AEAD_SHORT(CCM,1)
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,1):0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c00001030000000141050000000018000000644573206b457901644573206b457902644573206b457904":TEST_FLAG_EXERCISE
-
-read type: DES 192-bit, AEAD_SHORT(GCM,1)
-depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM,1):0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c00001030000000241050000000018000000644573206b457901644573206b457902644573206b457904":TEST_FLAG_EXERCISE
-
-read type: DES 192-bit, AEAD_SHORT(CCM,63)
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM,63):0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c0000103000000017f050000000018000000644573206b457901644573206b457902644573206b457904":TEST_FLAG_EXERCISE
-
-read type: DES 192-bit, CBC_MAC
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_CBC_MAC:0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c000013c00000001c0030000000018000000644573206b457901644573206b457902644573206b457904":TEST_FLAG_EXERCISE
-
 read type: DES 192-bit, CBC_NO_PADDING
 depends_on:PSA_WANT_ALG_CBC_NO_PADDING:PSA_WANT_KEY_TYPE_DES
 key_storage_read:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CBC_NO_PADDING:0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c00001030000004040040000000018000000644573206b457901644573206b457902644573206b457904":TEST_FLAG_EXERCISE
@@ -1044,50 +916,10 @@
 depends_on:PSA_WANT_ALG_CBC_PKCS7:PSA_WANT_KEY_TYPE_DES
 key_storage_read:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CBC_PKCS7:0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c00001030000004140040000000018000000644573206b457901644573206b457902644573206b457904":TEST_FLAG_EXERCISE
 
-read type: DES 192-bit, CCM
-depends_on:PSA_WANT_ALG_CCM:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CCM:0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c00001030000000150050000000018000000644573206b457901644573206b457902644573206b457904":TEST_FLAG_EXERCISE
-
-read type: DES 192-bit, CFB
-depends_on:PSA_WANT_ALG_CFB:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CFB:0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c000010300000011c0040000000018000000644573206b457901644573206b457902644573206b457904":TEST_FLAG_EXERCISE
-
-read type: DES 192-bit, CMAC
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_CMAC:0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c000013c00000002c0030000000018000000644573206b457901644573206b457902644573206b457904":TEST_FLAG_EXERCISE
-
-read type: DES 192-bit, CTR
-depends_on:PSA_WANT_ALG_CTR:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_CTR:0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c000010300000010c0040000000018000000644573206b457901644573206b457902644573206b457904":TEST_FLAG_EXERCISE
-
 read type: DES 192-bit, ECB_NO_PADDING
 depends_on:PSA_WANT_ALG_ECB_NO_PADDING:PSA_WANT_KEY_TYPE_DES
 key_storage_read:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_ECB_NO_PADDING:0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c00001030000004440040000000018000000644573206b457901644573206b457902644573206b457904":TEST_FLAG_EXERCISE
 
-read type: DES 192-bit, GCM
-depends_on:PSA_WANT_ALG_GCM:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_GCM:0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c00001030000000250050000000018000000644573206b457901644573206b457902644573206b457904":TEST_FLAG_EXERCISE
-
-read type: DES 192-bit, OFB
-depends_on:PSA_WANT_ALG_OFB:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_OFB:0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c000010300000012c0040000000018000000644573206b457901644573206b457902644573206b457904":TEST_FLAG_EXERCISE
-
-read type: DES 192-bit, TRUNCATED_MAC(CBC_MAC,1)
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,1):0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c000013c00000001c1030000000018000000644573206b457901644573206b457902644573206b457904":TEST_FLAG_EXERCISE
-
-read type: DES 192-bit, TRUNCATED_MAC(CMAC,1)
-depends_on:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CMAC,1):0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c000013c00000002c1030000000018000000644573206b457901644573206b457902644573206b457904":TEST_FLAG_EXERCISE
-
-read type: DES 192-bit, TRUNCATED_MAC(CBC_MAC,63)
-depends_on:PSA_WANT_ALG_CBC_MAC:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_SIGN_HASH | PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_HASH | PSA_KEY_USAGE_VERIFY_MESSAGE:PSA_ALG_TRUNCATED_MAC(PSA_ALG_CBC_MAC,63):0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c000013c00000001ff030000000018000000644573206b457901644573206b457902644573206b457904":TEST_FLAG_EXERCISE
-
-read type: DES 192-bit, XTS
-depends_on:PSA_WANT_ALG_XTS:PSA_WANT_KEY_TYPE_DES
-key_storage_read:0x0001:PSA_KEY_TYPE_DES:192:PSA_KEY_USAGE_DECRYPT | PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_EXPORT:PSA_ALG_XTS:0x0000:"644573206b457901644573206b457902644573206b457904":"505341004b45590000000000010000000123c0000103000000ff40040000000018000000644573206b457901644573206b457902644573206b457904":TEST_FLAG_EXERCISE
-
 read type: ECC_PAIR(BP_R1) 160-bit
 depends_on:PSA_WANT_ECC_BRAINPOOL_P_R1_160:PSA_WANT_KEY_TYPE_ECC_KEY_PAIR
 key_storage_read:0x0001:PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_FAMILY_BRAINPOOL_P_R1):160:PSA_KEY_USAGE_EXPORT:0x0000:0x0000:"69502c4fdaf48d4fa617bdd24498b0406d0eeaac":"505341004b45590000000000010000003071a0000100000000000000000000001400000069502c4fdaf48d4fa617bdd24498b0406d0eeaac":TEST_FLAG_EXERCISE
commit	4eb1c7e965f675eb12046d270f0d8c359880732b	[log] [tgz]
author	Gilles Peskine <Gilles.Peskine@arm.com>	Fri Mar 18 10:18:58 2022 +0100
committer	Gilles Peskine <Gilles.Peskine@arm.com>	Fri Apr 15 16:15:48 2022 +0200
tree	5116f7186c700e31930190776af42a9afe0dc951
parent	0de11438bb90535cd23b98f6f99aff0c54ecb45a [diff]