Update PSA crypto test dependencies
Given the PSA_WANT_* config options added lately,
update set_psa_test_dependencies.py and run it
on test_suite_psa_crypto*.data files but the SE
and generated ones.
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
diff --git a/tests/scripts/set_psa_test_dependencies.py b/tests/scripts/set_psa_test_dependencies.py
index 3f5a0d4..61923d8 100755
--- a/tests/scripts/set_psa_test_dependencies.py
+++ b/tests/scripts/set_psa_test_dependencies.py
@@ -29,16 +29,16 @@
# Only features that affect what can be done are listed here.
# Options that control optimizations or alternative implementations
# are omitted.
- #cipher#'MBEDTLS_CIPHER_MODE_CBC',
- #cipher#'MBEDTLS_CIPHER_MODE_CFB',
- #cipher#'MBEDTLS_CIPHER_MODE_CTR',
- #cipher#'MBEDTLS_CIPHER_MODE_OFB',
- #cipher#'MBEDTLS_CIPHER_MODE_XTS',
- #cipher#'MBEDTLS_CIPHER_NULL_CIPHER',
- #cipher#'MBEDTLS_CIPHER_PADDING_PKCS7',
- #cipher#'MBEDTLS_CIPHER_PADDING_ONE_AND_ZEROS',
- #cipher#'MBEDTLS_CIPHER_PADDING_ZEROS_AND_LEN',
- #cipher#'MBEDTLS_CIPHER_PADDING_ZEROS',
+ 'MBEDTLS_CIPHER_MODE_CBC',
+ 'MBEDTLS_CIPHER_MODE_CFB',
+ 'MBEDTLS_CIPHER_MODE_CTR',
+ 'MBEDTLS_CIPHER_MODE_OFB',
+ 'MBEDTLS_CIPHER_MODE_XTS',
+ 'MBEDTLS_CIPHER_NULL_CIPHER',
+ 'MBEDTLS_CIPHER_PADDING_PKCS7',
+ 'MBEDTLS_CIPHER_PADDING_ONE_AND_ZEROS',
+ 'MBEDTLS_CIPHER_PADDING_ZEROS_AND_LEN',
+ 'MBEDTLS_CIPHER_PADDING_ZEROS',
#curve#'MBEDTLS_ECP_DP_SECP192R1_ENABLED',
#curve#'MBEDTLS_ECP_DP_SECP224R1_ENABLED',
#curve#'MBEDTLS_ECP_DP_SECP256R1_ENABLED',
@@ -61,35 +61,35 @@
# Mbed TLS modules.
# Only modules that provide cryptographic mechanisms are listed here.
# Platform, data formatting, X.509 or TLS modules are omitted.
- #cipher#'MBEDTLS_AES_C',
- #cipher#'MBEDTLS_ARC4_C',
+ 'MBEDTLS_AES_C',
+ 'MBEDTLS_ARC4_C',
'MBEDTLS_BIGNUM_C',
#cipher#'MBEDTLS_BLOWFISH_C',
- #cipher#'MBEDTLS_CAMELLIA_C',
- #cipher#'MBEDTLS_ARIA_C',
- #cipher#'MBEDTLS_CCM_C',
- #cipher#'MBEDTLS_CHACHA20_C',
- #cipher#'MBEDTLS_CHACHAPOLY_C',
- #cipher#'MBEDTLS_CMAC_C',
+ 'MBEDTLS_CAMELLIA_C',
+ 'MBEDTLS_ARIA_C',
+ 'MBEDTLS_CCM_C',
+ 'MBEDTLS_CHACHA20_C',
+ 'MBEDTLS_CHACHAPOLY_C',
+ 'MBEDTLS_CMAC_C',
'MBEDTLS_CTR_DRBG_C',
- #cipher#'MBEDTLS_DES_C',
+ 'MBEDTLS_DES_C',
'MBEDTLS_DHM_C',
'MBEDTLS_ECDH_C',
'MBEDTLS_ECDSA_C',
'MBEDTLS_ECJPAKE_C',
'MBEDTLS_ECP_C',
'MBEDTLS_ENTROPY_C',
- #cipher#'MBEDTLS_GCM_C',
+ 'MBEDTLS_GCM_C',
'MBEDTLS_HKDF_C',
'MBEDTLS_HMAC_DRBG_C',
- #cipher#'MBEDTLS_NIST_KW_C',
+ 'MBEDTLS_NIST_KW_C',
'MBEDTLS_MD2_C',
'MBEDTLS_MD4_C',
'MBEDTLS_MD5_C',
'MBEDTLS_PKCS5_C',
'MBEDTLS_PKCS12_C',
- #cipher#'MBEDTLS_POLY1305_C',
- #cipher#'MBEDTLS_RIPEMD160_C',
+ 'MBEDTLS_POLY1305_C',
+ 'MBEDTLS_RIPEMD160_C',
'MBEDTLS_RSA_C',
'MBEDTLS_SHA1_C',
'MBEDTLS_SHA256_C',
@@ -119,27 +119,6 @@
'PSA_KEY_TYPE_RAW_DATA', # always supported, don't list it to reduce noise
'PSA_ALG_AT_LEAST_THIS_LENGTH_MAC', #only a modifier
'PSA_ALG_AEAD_WITH_AT_LEAST_THIS_LENGTH_TAG', #only a modifier
-
- # Not implemented yet: cipher-related key types and algorithms.
- # Manually extracted from crypto_values.h.
- 'PSA_KEY_TYPE_AES',
- 'PSA_KEY_TYPE_DES',
- 'PSA_KEY_TYPE_CAMELLIA',
- 'PSA_KEY_TYPE_ARC4',
- 'PSA_KEY_TYPE_CHACHA20',
- 'PSA_ALG_CBC_MAC',
- 'PSA_ALG_CMAC',
- 'PSA_ALG_STREAM_CIPHER',
- 'PSA_ALG_CTR',
- 'PSA_ALG_CFB',
- 'PSA_ALG_OFB',
- 'PSA_ALG_XTS',
- 'PSA_ALG_ECB_NO_PADDING',
- 'PSA_ALG_CBC_NO_PADDING',
- 'PSA_ALG_CBC_PKCS7',
- 'PSA_ALG_CCM',
- 'PSA_ALG_GCM',
- 'PSA_ALG_CHACHA20_POLY1305',
])
SPECIAL_SYSTEMATIC_DEPENDENCIES = {