commit 710c64046b50f092312855bb29d4045d813d8578
author Xinyu Zhang <xinyu.zhang@arm.com> Thu Jun 30 11:34:45 2022 +0800
committer David Hu <david.hu@arm.com> Fri Jul 01 10:39:18 2022 +0200
tree 26f802953a8cd09e592ce7a38f0ea7e7120cb581
parent bbb8a956161d0f49f84d27f7faf79c70f5252ca7

Crypto: Fix build warning

encrypted_data_single_shot is only used when
TFM_CRYPTO_TEST_SINGLE_PART_FUNCS is defined.

Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: I4a6a3f0b2ba7cc481b2f32c1133c1f7c3bd82425

test/secure_fw/suites/crypto/crypto_tests_common.c

diff --git a/test/secure_fw/suites/crypto/crypto_tests_common.c b/test/secure_fw/suites/crypto/crypto_tests_common.c
index c31e0e5..023714c 100644
--- a/test/secure_fw/suites/crypto/crypto_tests_common.c
+++ b/test/secure_fw/suites/crypto/crypto_tests_common.c
@@ -949,7 +949,6 @@
     uint8_t iv[16] = {0};
     const uint8_t plain_text[PLAIN_DATA_SIZE] =
         "This is my plaintext to encrypt, 48 bytes long!";
-    uint8_t encrypted_data_single_shot[ENC_DEC_BUFFER_SIZE];
     uint8_t decrypted_data[ENC_DEC_BUFFER_SIZE] = {0};
     size_t output_length = 0, total_output_length = 0;
     union {
@@ -960,6 +959,9 @@
     psa_key_attributes_t key_attributes = psa_key_attributes_init();
     psa_key_usage_t usage = (PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_DECRYPT);
     bool bAbortDecryption = false;
+#ifdef TFM_CRYPTO_TEST_SINGLE_PART_FUNCS
+    uint8_t encrypted_data_single_shot[ENC_DEC_BUFFER_SIZE];
+#endif
 
     if (iv_length > 16) {
         TEST_FAIL("Unexpected IV length greater than 16 for this alg/key type");
@@ -1593,13 +1595,15 @@
         "This is my associated data to authenticate";
     uint8_t decrypted_data[MAX_PLAIN_DATA_SIZE_AEAD] = {0};
     uint8_t encrypted_data[ENC_DEC_BUFFER_SIZE_AEAD] = {0};
-    uint8_t encrypted_data_single_shot[ENC_DEC_BUFFER_SIZE_AEAD] = {0};
     size_t encrypted_data_length = 0, decrypted_data_length = 0;
     size_t total_output_length = 0, total_encrypted_length = 0;
     uint32_t comp_result;
     psa_key_attributes_t key_attributes = psa_key_attributes_init();
     psa_key_attributes_t retrieved_attributes = psa_key_attributes_init();
     psa_key_usage_t usage = (PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_DECRYPT);
+#ifdef TFM_CRYPTO_TEST_SINGLE_PART_FUNCS
+    uint8_t encrypted_data_single_shot[ENC_DEC_BUFFER_SIZE_AEAD] = {0};
+#endif
 
     /* Variables required for multipart operations */
     uint8_t *tag = &encrypted_data[MAX_PLAIN_DATA_SIZE_AEAD];