aboutsummaryrefslogtreecommitdiff
path: root/test/suites/crypto/secure/crypto_sec_interface_testsuite.c
diff options
context:
space:
mode:
Diffstat (limited to 'test/suites/crypto/secure/crypto_sec_interface_testsuite.c')
-rw-r--r--test/suites/crypto/secure/crypto_sec_interface_testsuite.c26
1 files changed, 4 insertions, 22 deletions
diff --git a/test/suites/crypto/secure/crypto_sec_interface_testsuite.c b/test/suites/crypto/secure/crypto_sec_interface_testsuite.c
index 6803d92b23..1980346f3c 100644
--- a/test/suites/crypto/secure/crypto_sec_interface_testsuite.c
+++ b/test/suites/crypto/secure/crypto_sec_interface_testsuite.c
@@ -21,12 +21,8 @@ static void tfm_crypto_test_5003(struct test_result_t *ret);
#ifdef TFM_CRYPTO_TEST_ALG_CTR
static void tfm_crypto_test_5005(struct test_result_t *ret);
#endif /* TFM_CRYPTO_TEST_ALG_CTR */
-#ifdef TFM_CRYPTO_TEST_ALG_GCM
static void tfm_crypto_test_5007(struct test_result_t *ret);
-#endif /* TFM_CRYPTO_TEST_ALG_GCM */
-#ifdef TFM_CRYPTO_TEST_ALG_CBC
static void tfm_crypto_test_5008(struct test_result_t *ret);
-#endif /* TFM_CRYPTO_TEST_ALG_CBC */
#ifdef TFM_CRYPTO_TEST_ALG_CFB
static void tfm_crypto_test_5009(struct test_result_t *ret);
#endif /* TFM_CRYPTO_TEST_ALG_CFB */
@@ -50,11 +46,9 @@ static void tfm_crypto_test_5030(struct test_result_t *ret);
#ifdef TFM_CRYPTO_TEST_ALG_GCM
static void tfm_crypto_test_5031(struct test_result_t *ret);
#endif /* TFM_CRYPTO_TEST_ALG_GCM */
-#ifdef TFM_CRYPTO_TEST_ALG_CBC
static void tfm_crypto_test_5032(struct test_result_t *ret);
static void tfm_crypto_test_5033(struct test_result_t *ret);
static void tfm_crypto_test_5034(struct test_result_t *ret);
-#endif /* TFM_CRYPTO_TEST_ALG_CBC */
static void tfm_crypto_test_5035(struct test_result_t *ret);
static struct test_t crypto_tests[] = {
@@ -72,14 +66,10 @@ static struct test_t crypto_tests[] = {
{&tfm_crypto_test_5005, "TFM_CRYPTO_TEST_5005",
"Secure Symmetric encryption (AES-128-CTR) interface", {TEST_PASSED} },
#endif /* TFM_CRYPTO_TEST_ALG_CTR */
-#ifdef TFM_CRYPTO_TEST_ALG_GCM
{&tfm_crypto_test_5007, "TFM_CRYPTO_TEST_5007",
- "Secure Symmetric encryption invalid cipher (AES-128-GCM)", {TEST_PASSED} },
-#endif /* TFM_CRYPTO_TEST_ALG_GCM */
-#ifdef TFM_CRYPTO_TEST_ALG_CBC
+ "Secure Symmetric encryption invalid cipher", {TEST_PASSED} },
{&tfm_crypto_test_5008, "TFM_CRYPTO_TEST_5008",
- "Secure Symmetric encryption invalid cipher (AES-152-CBC)", {TEST_PASSED} },
-#endif /* TFM_CRYPTO_TEST_ALG_CBC */
+ "Secure Symmetric encryption invalid cipher (AES-152)", {TEST_PASSED} },
#ifdef TFM_CRYPTO_TEST_ALG_CFB
{&tfm_crypto_test_5009, "TFM_CRYPTO_TEST_5009",
"Secure Symmetric encryption invalid cipher (HMAC-128-CFB)", {TEST_PASSED} },
@@ -116,14 +106,12 @@ static struct test_t crypto_tests[] = {
{&tfm_crypto_test_5031, "TFM_CRYPTO_TEST_5031",
"Secure AEAD (AES-128-GCM) interface", {TEST_PASSED} },
#endif /* TFM_CRYPTO_TEST_ALG_GCM */
-#ifdef TFM_CRYPTO_TEST_ALG_CBC
{&tfm_crypto_test_5032, "TFM_CRYPTO_TEST_5032",
"Secure key policy interface", {TEST_PASSED} },
{&tfm_crypto_test_5033, "TFM_CRYPTO_TEST_5033",
"Secure key policy check permissions", {TEST_PASSED} },
{&tfm_crypto_test_5034, "TFM_CRYPTO_TEST_5034",
"Secure persistent key interface", {TEST_PASSED} },
-#endif /* TFM_CRYPTO_TEST_ALG_CBC */
{&tfm_crypto_test_5035, "TFM_CRYPTO_TEST_5035",
"Key access control", {TEST_PASSED} },
};
@@ -171,20 +159,16 @@ static void tfm_crypto_test_5005(struct test_result_t *ret)
}
#endif /* TFM_CRYPTO_TEST_ALG_CTR */
-#ifdef TFM_CRYPTO_TEST_ALG_GCM
static void tfm_crypto_test_5007(struct test_result_t *ret)
{
- /* GCM is an AEAD mode */
- psa_invalid_cipher_test(PSA_KEY_TYPE_AES, PSA_ALG_GCM, 16, ret);
+ psa_invalid_cipher_test(PSA_KEY_TYPE_AES, PSA_ALG_HMAC(PSA_ALG_SHA_256),
+ 16, ret);
}
-#endif /* TFM_CRYPTO_TEST_ALG_GCM */
-#ifdef TFM_CRYPTO_TEST_ALG_CBC
static void tfm_crypto_test_5008(struct test_result_t *ret)
{
psa_invalid_key_length_test(ret);
}
-#endif /* TFM_CRYPTO_TEST_ALG_CBC */
#ifdef TFM_CRYPTO_TEST_ALG_CFB
static void tfm_crypto_test_5009(struct test_result_t *ret)
@@ -263,7 +247,6 @@ static void tfm_crypto_test_5031(struct test_result_t *ret)
}
#endif /* TFM_CRYPTO_TEST_ALG_GCM */
-#ifdef TFM_CRYPTO_TEST_ALG_CBC
static void tfm_crypto_test_5032(struct test_result_t *ret)
{
psa_policy_key_interface_test(ret);
@@ -278,7 +261,6 @@ static void tfm_crypto_test_5034(struct test_result_t *ret)
{
psa_persistent_key_test(1, ret);
}
-#endif /* TFM_CRYPTO_TEST_ALG_CBC */
/**
* \brief Tests key access control based on partition ID