commit 44b422935244e834ac4ec22e1937a0f8a5648b67
author Shelly Liberman <shelly.liberman@arm.com> Wed Nov 25 21:11:36 2020 +0200
committer Shelly Liberman <shelly.liberman@arm.com> Thu Nov 26 10:54:19 2020 +0200
tree 733a352b7af03c405345036add92d5cc5c980c3b
parent c907c81a3b6212c90c0c5176432328e422ab091c
parent 88da3c245b776ebd6afc9fa048492cca565cf296

masked-aes CI problems fixes

Signed-off-by: Shelly Liberman <shelly.liberman@arm.com>

include/mbedtls/aes.h

diff --git a/include/mbedtls/aes.h b/include/mbedtls/aes.h
index 18c50bb..0a02642 100644
--- a/include/mbedtls/aes.h
+++ b/include/mbedtls/aes.h
@@ -84,9 +84,9 @@
  * \brief The AES context-type definition.
  */
 
-//#if defined(MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH)
-#define AES_128_EXPANDED_KEY_SIZE_IN_WORDS 44
-//#endif
+#if defined(MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH)
+#define MBEDTLS_AES_128_EXPANDED_KEY_SIZE_IN_WORDS 44
+#endif
 typedef struct mbedtls_aes_context
 {
     int nr;                     /*!< The number of rounds. */
@@ -98,7 +98,7 @@
     uint32_t hash;               /*!< hash of the set key */
 #endif
 #if defined(MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH) && !defined(MBEDTLS_PADLOCK_C)
-    uint32_t buf[AES_128_EXPANDED_KEY_SIZE_IN_WORDS];           /*!< Unaligned data buffer for expanded key only */
+    uint32_t buf[MBEDTLS_AES_128_EXPANDED_KEY_SIZE_IN_WORDS];           /*!< Unaligned data buffer for expanded key only */
 #else /* MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH */
     uint32_t buf[68];           /*!< Unaligned data buffer. This buffer can
                                      hold 32 extra Bytes, which can be used for