commit 6cf05f9322e79ef1c44021cf871bfabc20eba87e
author Thomas Daubney <thomas.daubney@arm.com> Thu Jul 18 11:30:22 2024 +0100
committer Thomas Daubney <thomas.daubney@arm.com> Tue Aug 06 15:15:51 2024 +0100
tree 73d0db06f5761ff73e5e717d8013208d643b6e82
parent 955ce581427887ed9396cdf6ce5b3f3665eadd23

Remove MBEDTLS_AES_ENCRYPT_ALT

Signed-off-by: Thomas Daubney <thomas.daubney@arm.com>

tf-psa-crypto/drivers/builtin/src/aes.c

diff --git a/tf-psa-crypto/drivers/builtin/src/aes.c b/tf-psa-crypto/drivers/builtin/src/aes.c
index f7d6a61..4b7a1e9 100644
--- a/tf-psa-crypto/drivers/builtin/src/aes.c
+++ b/tf-psa-crypto/drivers/builtin/src/aes.c
@@ -842,13 +842,14 @@
                AES_RT3(MBEDTLS_BYTE_3(Y0));     \
     } while (0)
 
+#if !defined(MBEDTLS_AES_USE_HARDWARE_ONLY)
 /*
  * AES-ECB block encryption
  */
-#if !defined(MBEDTLS_AES_ENCRYPT_ALT)
-int mbedtls_internal_aes_encrypt(mbedtls_aes_context *ctx,
-                                 const unsigned char input[16],
-                                 unsigned char output[16])
+MBEDTLS_CHECK_RETURN_TYPICAL
+static int mbedtls_internal_aes_encrypt(mbedtls_aes_context *ctx,
+                                        const unsigned char input[16],
+                                        unsigned char output[16])
 {
     int i;
     uint32_t *RK = ctx->buf + ctx->rk_offset;
@@ -902,7 +903,7 @@
 
     return 0;
 }
-#endif /* !MBEDTLS_AES_ENCRYPT_ALT */
+#endif /* !MBEDTLS_AES_USE_HARDWARE_ONLY */
 
 /*
  * AES-ECB block decryption