From bef71a9724281ef421aab234e5bdafa47c5f5ad3 Mon Sep 17 00:00:00 2001 From: Laukik Hase Date: Thu, 2 Jul 2026 15:14:42 +0530 Subject: [PATCH] ci(esp_tee): Fix `tee_cli_app` build failure due to heap size overflow - Also fix the `unused variable` warning while builing the PSA AES tests with `tee_test_fw` app --- .../test_apps/tee_cli_app/sdkconfig.ci.minimal_tee | 4 ++-- .../esp_tee/test_apps/tee_cli_app/sdkconfig.ci.release | 4 ++-- .../mbedtls/test_apps/mbedtls_ut/main/test_psa_aes.c | 10 ++++++++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/components/esp_tee/test_apps/tee_cli_app/sdkconfig.ci.minimal_tee b/components/esp_tee/test_apps/tee_cli_app/sdkconfig.ci.minimal_tee index eb2f53d45c5..2cff4b58aa5 100644 --- a/components/esp_tee/test_apps/tee_cli_app/sdkconfig.ci.minimal_tee +++ b/components/esp_tee/test_apps/tee_cli_app/sdkconfig.ci.minimal_tee @@ -5,8 +5,8 @@ CONFIG_SECURE_TEE_SEC_STG_EFUSE_HMAC_KEY_ID=5 # Reducing TEE I/DRAM sizes # 24KB CONFIG_SECURE_TEE_IRAM_SIZE=0x6000 -# 16KB -CONFIG_SECURE_TEE_DRAM_SIZE=0x4000 +# 17KB +CONFIG_SECURE_TEE_DRAM_SIZE=0x4400 # Disable TEE logs (also disable all panic logs) CONFIG_SECURE_TEE_DEBUG_MODE=n diff --git a/components/esp_tee/test_apps/tee_cli_app/sdkconfig.ci.release b/components/esp_tee/test_apps/tee_cli_app/sdkconfig.ci.release index f4c39acfebb..896ec7f645d 100644 --- a/components/esp_tee/test_apps/tee_cli_app/sdkconfig.ci.release +++ b/components/esp_tee/test_apps/tee_cli_app/sdkconfig.ci.release @@ -2,8 +2,8 @@ # builds across various configurations - and is not intended for production use. # Reducing TEE IRAM size -# 30KB -CONFIG_SECURE_TEE_IRAM_SIZE=0x7800 +# 30.5KB +CONFIG_SECURE_TEE_IRAM_SIZE=0x7A00 # TEE Secure Storage: Release mode CONFIG_SECURE_TEE_SEC_STG_MODE_RELEASE=y diff --git a/components/mbedtls/test_apps/mbedtls_ut/main/test_psa_aes.c b/components/mbedtls/test_apps/mbedtls_ut/main/test_psa_aes.c index cc954a83567..448ccf5dd62 100644 --- a/components/mbedtls/test_apps/mbedtls_ut/main/test_psa_aes.c +++ b/components/mbedtls/test_apps/mbedtls_ut/main/test_psa_aes.c @@ -1623,6 +1623,7 @@ TEST_CASE("mbedtls CTR, input buf = output buf", "[aes]") status = psa_cipher_finish(&operation, buf + output_len, SZ - output_len, &output_len); TEST_ASSERT_EQUAL(PSA_SUCCESS, status); total_len += output_len; + TEST_ASSERT_EQUAL(SZ, total_len); TEST_ASSERT_EQUAL_HEX8_ARRAY(expected_cipher_ctr_inplace_end, buf + SZ - 32, 32); @@ -1645,6 +1646,7 @@ TEST_CASE("mbedtls CTR, input buf = output buf", "[aes]") status = psa_cipher_finish(&operation, buf + output_len, SZ - output_len, &output_len); TEST_ASSERT_EQUAL(PSA_SUCCESS, status); total_len += output_len; + TEST_ASSERT_EQUAL(SZ, total_len); for (int i = 0; i < SZ; i++) { TEST_ASSERT_EQUAL_HEX8(0x3A, buf[i]); @@ -1710,6 +1712,7 @@ TEST_CASE("mbedtls OFB, chained DMA descriptors", "[aes]") status = psa_cipher_finish(&operation, ciphertext + output_len, SZ - output_len, &output_len); TEST_ASSERT_EQUAL(PSA_SUCCESS, status); total_len += output_len; + TEST_ASSERT_EQUAL(SZ, total_len); TEST_ASSERT_EQUAL_HEX8_ARRAY(expected_cipher_ofb_chained_end, ciphertext + SZ - 32, 32); @@ -1732,6 +1735,7 @@ TEST_CASE("mbedtls OFB, chained DMA descriptors", "[aes]") status = psa_cipher_finish(&operation, decryptedtext + output_len, SZ - output_len, &output_len); TEST_ASSERT_EQUAL(PSA_SUCCESS, status); total_len += output_len; + TEST_ASSERT_EQUAL(SZ, total_len); TEST_ASSERT_EQUAL_HEX8_ARRAY(plaintext, decryptedtext, SZ); @@ -1800,6 +1804,7 @@ void aes_ctr_alignment_test(uint32_t input_buf_caps, uint32_t output_buf_caps) status = psa_cipher_finish(&operation, ciphertext + i + output_len, SZ - output_len, &output_len); TEST_ASSERT_EQUAL(PSA_SUCCESS, status); total_len += output_len; + TEST_ASSERT_EQUAL(SZ, total_len); TEST_ASSERT_EQUAL_HEX8_ARRAY(expected_cipher_ctr, ciphertext + i, SZ); @@ -1822,6 +1827,7 @@ void aes_ctr_alignment_test(uint32_t input_buf_caps, uint32_t output_buf_caps) status = psa_cipher_finish(&operation, decryptedtext + output_len, SZ - output_len, &output_len); TEST_ASSERT_EQUAL(PSA_SUCCESS, status); total_len += output_len; + TEST_ASSERT_EQUAL(SZ, total_len); TEST_ASSERT_EQUAL_HEX8_ARRAY(plaintext, decryptedtext, SZ); } @@ -1896,6 +1902,7 @@ void aes_psram_one_buf_ctr_test(void) status = psa_cipher_finish(&operation, buf + i + output_len, SZ - output_len, &output_len); TEST_ASSERT_EQUAL(PSA_SUCCESS, status); total_len += output_len; + TEST_ASSERT_EQUAL(SZ, total_len); TEST_ASSERT_EQUAL_HEX8_ARRAY(expected_cipher_ctr, buf + i, SZ); @@ -1918,6 +1925,7 @@ void aes_psram_one_buf_ctr_test(void) status = psa_cipher_finish(&operation, buf + output_len, SZ - output_len, &output_len); TEST_ASSERT_EQUAL(PSA_SUCCESS, status); total_len += output_len; + TEST_ASSERT_EQUAL(SZ, total_len); TEST_ASSERT_EACH_EQUAL_HEX8(0x26, buf + i, SZ - i); } @@ -1977,6 +1985,7 @@ void aes_ext_flash_ctr_test(uint32_t output_buf_caps) status = psa_cipher_finish(&operation, ciphertext + output_len, SZ - output_len, &output_len); TEST_ASSERT_EQUAL(PSA_SUCCESS, status); total_len += output_len; + TEST_ASSERT_EQUAL(SZ, total_len); TEST_ASSERT_EQUAL_HEX8_ARRAY(expected_cipher_long_input_end, ciphertext + SZ - 32, 32); @@ -1999,6 +2008,7 @@ void aes_ext_flash_ctr_test(uint32_t output_buf_caps) status = psa_cipher_finish(&operation, decryptedtext + output_len, SZ - output_len, &output_len); TEST_ASSERT_EQUAL(PSA_SUCCESS, status); total_len += output_len; + TEST_ASSERT_EQUAL(SZ, total_len); TEST_ASSERT_EQUAL_HEX8_ARRAY(long_input, decryptedtext, SZ);