masked-aes CI problems fixes
Signed-off-by: Shelly Liberman <shelly.liberman@arm.com>
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
diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
index 61deff2..1ac2c81 100644
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
@@ -2971,6 +2971,18 @@
//#define MBEDTLS_MEMORY_BUFFER_ALLOC_C
/**
+ * \def MBEDTLS_PLATFORM_FAULT_CALLBACKS
+ *
+ * Uncomment to provide your own alternate implementation for mbedtls_platform_fault(),
+ * used in library/platform_util.c to signal a fault injection in either
+ * mbedtls_platform_memcpy or mbedtls_platform_memset.
+ *
+ * You will need to provide a header "platform_fault.h" and an implementation at
+ * compile time.
+ */
+//#define MBEDTLS_PLATFORM_FAULT_CALLBACKS
+
+/**
* \def MBEDTLS_NET_C
*
* Enable the TCP and UDP over IPv6/IPv4 networking routines.
diff --git a/include/mbedtls/platform_util.h b/include/mbedtls/platform_util.h
index e0bd08c..4999500 100644
--- a/include/mbedtls/platform_util.h
+++ b/include/mbedtls/platform_util.h
@@ -276,9 +276,9 @@
* cryptographically secure RNG, but provide an RNG for utility
* functions.
*
- * \note If the given range is [0, 0), 0 is returned.
- *
* \param num Max-value for the generated random number, exclusive.
+ * Must be greater than zero, otherwise an undefined behavior
+ * will occur on "num % 0".
* The generated number will be on range [0, num).
*
* \return The generated random number.