commit b3e4c78e73d88375b34b1d080a91d8834e3b0fa1
author Antonio de Angelis <Antonio.deAngelis@arm.com> Fri Sep 09 14:39:41 2022 +0100
committer Antonio de Angelis <Antonio.deAngelis@arm.com> Fri Sep 09 14:39:43 2022 +0100
tree d9ad88d79d111e0fee285466ed5ed704d83b0131
parent 8d57702fe7f39c5ccc78dc94dd56cc974a884306

Crypto: Add a 256 bit key length test for AES-CTR

Add a test for AES-256-CTR to exercise a Cipher mode of AES
such as CTR but using a 256 bit key instead of 128 bit key
used as default.

Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com>
Change-Id: Ic59d464b92bd6bed26232afcf49cb62067359e2e

test/secure_fw/suites/crypto/non_secure/crypto_ns_interface_testsuite.c

diff --git a/test/secure_fw/suites/crypto/non_secure/crypto_ns_interface_testsuite.c b/test/secure_fw/suites/crypto/non_secure/crypto_ns_interface_testsuite.c
index 400d9aa..b5e57b8 100644
--- a/test/secure_fw/suites/crypto/non_secure/crypto_ns_interface_testsuite.c
+++ b/test/secure_fw/suites/crypto/non_secure/crypto_ns_interface_testsuite.c
@@ -19,6 +19,7 @@
 #endif /* TFM_CRYPTO_TEST_ALG_CFB */
 #ifdef TFM_CRYPTO_TEST_ALG_CTR
 static void tfm_crypto_test_1005(struct test_result_t *ret);
+static void tfm_crypto_test_1006(struct test_result_t *ret);
 #endif /* TFM_CRYPTO_TEST_ALG_CTR */
 static void tfm_crypto_test_1007(struct test_result_t *ret);
 static void tfm_crypto_test_1008(struct test_result_t *ret);
@@ -100,6 +101,8 @@
 #ifdef TFM_CRYPTO_TEST_ALG_CTR
     {&tfm_crypto_test_1005, "TFM_NS_CRYPTO_TEST_1005",
      "Non Secure Symmetric encryption (AES-128-CTR) interface"},
+    {&tfm_crypto_test_1006, "TFM_NS_CRYPTO_TEST_1006",
+     "Non Secure Symmetric encryption (AES-256-CTR) interface"},
 #endif /* TFM_CRYPTO_TEST_ALG_CTR */
     {&tfm_crypto_test_1007, "TFM_NS_CRYPTO_TEST_1007",
      "Non Secure Symmetric encryption invalid cipher"},
@@ -245,6 +248,12 @@
     psa_cipher_test(PSA_KEY_TYPE_AES, PSA_ALG_CTR,
                     test_key_128, BIT_SIZE_TEST_KEY, ret);
 }
+
+static void tfm_crypto_test_1006(struct test_result_t *ret)
+{
+    psa_cipher_test(PSA_KEY_TYPE_AES, PSA_ALG_CTR,
+                    test_key_256, BIT_SIZE_TEST_LONG_KEY, ret);
+}
 #endif /* TFM_CRYPTO_TEST_ALG_CTR */
 
 static void tfm_crypto_test_1007(struct test_result_t *ret)

test/secure_fw/suites/crypto/secure/crypto_sec_interface_testsuite.c

diff --git a/test/secure_fw/suites/crypto/secure/crypto_sec_interface_testsuite.c b/test/secure_fw/suites/crypto/secure/crypto_sec_interface_testsuite.c
index 3a56031..d6652d1 100644
--- a/test/secure_fw/suites/crypto/secure/crypto_sec_interface_testsuite.c
+++ b/test/secure_fw/suites/crypto/secure/crypto_sec_interface_testsuite.c
@@ -20,6 +20,7 @@
 #endif /* TFM_CRYPTO_TEST_ALG_CFB */
 #ifdef TFM_CRYPTO_TEST_ALG_CTR
 static void tfm_crypto_test_1005(struct test_result_t *ret);
+static void tfm_crypto_test_1006(struct test_result_t *ret);
 #endif /* TFM_CRYPTO_TEST_ALG_CTR */
 static void tfm_crypto_test_1007(struct test_result_t *ret);
 static void tfm_crypto_test_1008(struct test_result_t *ret);
@@ -104,6 +105,8 @@
 #ifdef TFM_CRYPTO_TEST_ALG_CTR
     {&tfm_crypto_test_1005, "TFM_S_CRYPTO_TEST_1005",
      "Secure Symmetric encryption (AES-128-CTR) interface"},
+    {&tfm_crypto_test_1006, "TFM_S_CRYPTO_TEST_1006",
+     "Secure Symmetric encryption (AES-256-CTR) interface"},
 #endif /* TFM_CRYPTO_TEST_ALG_CTR */
     {&tfm_crypto_test_1007, "TFM_S_CRYPTO_TEST_1007",
      "Secure Symmetric encryption invalid cipher"},
@@ -259,6 +262,12 @@
     psa_cipher_test(PSA_KEY_TYPE_AES, PSA_ALG_CTR,
                     test_key_128, BIT_SIZE_TEST_KEY, ret);
 }
+
+static void tfm_crypto_test_1006(struct test_result_t *ret)
+{
+    psa_cipher_test(PSA_KEY_TYPE_AES, PSA_ALG_CTR,
+                    test_key_256, BIT_SIZE_TEST_LONG_KEY, ret);
+}
 #endif /* TFM_CRYPTO_TEST_ALG_CTR */
 
 static void tfm_crypto_test_1007(struct test_result_t *ret)