diff --git a/tests/include/test/drivers/crypto_config_test_driver_extension.h b/tests/include/test/drivers/crypto_config_test_driver_extension.h index af4686b97e..927009ad96 100644 --- a/tests/include/test/drivers/crypto_config_test_driver_extension.h +++ b/tests/include/test/drivers/crypto_config_test_driver_extension.h @@ -54,22 +54,6 @@ #endif #endif -#if defined(PSA_WANT_ALG_MD2) -#if defined(MBEDTLS_PSA_ACCEL_ALG_MD2) -#undef MBEDTLS_PSA_ACCEL_ALG_MD2 -#else -#define MBEDTLS_PSA_ACCEL_ALG_MD2 1 -#endif -#endif - -#if defined(PSA_WANT_ALG_MD4) -#if defined(MBEDTLS_PSA_ACCEL_ALG_MD4) -#undef MBEDTLS_PSA_ACCEL_ALG_MD4 -#else -#define MBEDTLS_PSA_ACCEL_ALG_MD4 1 -#endif -#endif - #if defined(PSA_WANT_ALG_MD5) #if defined(MBEDTLS_PSA_ACCEL_ALG_MD5) #undef MBEDTLS_PSA_ACCEL_ALG_MD5 @@ -231,7 +215,6 @@ #define MBEDTLS_PSA_ACCEL_KEY_TYPE_DERIVE 1 #define MBEDTLS_PSA_ACCEL_KEY_TYPE_HMAC 1 -#define MBEDTLS_PSA_ACCEL_KEY_TYPE_ARC4 1 #define MBEDTLS_PSA_ACCEL_KEY_TYPE_CHACHA20 1 #define MBEDTLS_PSA_ACCEL_KEY_TYPE_DES 1 #define MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_PUBLIC_KEY 1 diff --git a/tests/include/test/psa_exercise_key.h b/tests/include/test/psa_exercise_key.h index 6cffeb22bf..18333a9372 100644 --- a/tests/include/test/psa_exercise_key.h +++ b/tests/include/test/psa_exercise_key.h @@ -60,11 +60,7 @@ * part of another algorithm like a signature algorithm and the hashing is * completed through an Mbed TLS hash API, not the PSA one. */ -#if defined(MBEDTLS_MD2_C) -#define KNOWN_MBEDTLS_SUPPORTED_HASH_ALG PSA_ALG_MD2 -#elif defined(MBEDTLS_MD4_C) -#define KNOWN_MBEDTLS_SUPPORTED_HASH_ALG PSA_ALG_MD4 -#elif defined(MBEDTLS_MD5_C) +#if defined(MBEDTLS_MD5_C) #define KNOWN_MBEDTLS_SUPPORTED_HASH_ALG PSA_ALG_MD5 /* MBEDTLS_RIPEMD160_C omitted. This is necessary for the sake of * exercise_signature_key() because Mbed TLS doesn't support RIPEMD160 diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 219be42023..27b86dcdc9 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -1620,8 +1620,6 @@ component_test_psa_crypto_config_accel_rsa_signature () { # PSA_ALG_ANY_HASH as algorithm to test with the key, the chosen hash # algorithm based on the hashes supported by the library is also # supported by the test library. - scripts/config.py -f include/psa/crypto_config.h unset PSA_WANT_ALG_MD2 - scripts/config.py -f include/psa/crypto_config.h unset PSA_WANT_ALG_MD4 scripts/config.py -f include/psa/crypto_config.h unset PSA_WANT_ALG_MD5 scripts/config.py -f include/psa/crypto_config.h unset PSA_WANT_ALG_RIPEMD160_C @@ -1658,8 +1656,6 @@ component_test_psa_crypto_config_accel_rsa_signature () { scripts/config.py unset MBEDTLS_RSA_C scripts/config.py unset MBEDTLS_X509_RSASSA_PSS_SUPPORT - scripts/config.py unset MBEDTLS_MD2_C - scripts/config.py unset MBEDTLS_MD4_C scripts/config.py unset MBEDTLS_MD5_C scripts/config.py unset MBEDTLS_RIPEMD160_C scripts/config.py unset MBEDTLS_SSL_PROTO_TLS1 @@ -1687,14 +1683,12 @@ component_test_psa_crypto_config_accel_hash () { scripts/config.py -f include/psa/crypto_config.h unset PSA_WANT_ALG_STREAM_CIPHER scripts/config.py -f include/psa/crypto_config.h unset PSA_WANT_ALG_ECB_NO_PADDING - loc_accel_list="ALG_MD4 ALG_MD5 ALG_RIPEMD160 ALG_SHA_1 ALG_SHA_224 ALG_SHA_256 ALG_SHA_384 ALG_SHA_512" + loc_accel_list="ALG_MD5 ALG_RIPEMD160 ALG_SHA_1 ALG_SHA_224 ALG_SHA_256 ALG_SHA_384 ALG_SHA_512" loc_accel_flags=$( echo "$loc_accel_list" | sed 's/[^ ]* */-DLIBTESTDRIVER1_MBEDTLS_PSA_ACCEL_&/g' ) make -C tests libtestdriver1.a CFLAGS="$ASAN_CFLAGS $loc_accel_flags" LDFLAGS="$ASAN_CFLAGS" scripts/config.py set MBEDTLS_PSA_CRYPTO_DRIVERS scripts/config.py set MBEDTLS_PSA_CRYPTO_CONFIG - scripts/config.py unset MBEDTLS_MD2_C - scripts/config.py unset MBEDTLS_MD4_C scripts/config.py unset MBEDTLS_MD5_C scripts/config.py unset MBEDTLS_RIPEMD160_C scripts/config.py unset MBEDTLS_SHA1_C