commit 74852038ee3dbf98a426df86a0a08da0f4397b35
author Agathiyan Bragadeesh <agathiyan.bragadeesh2@arm.com> Fri Jul 14 15:56:33 2023 +0100
committer Agathiyan Bragadeesh <agathiyan.bragadeesh2@arm.com> Mon Jul 17 18:35:30 2023 +0100
tree 90c638e35cf6ac4e8cfca7fe491826414319e0d1
parent db084d16ea71e32312b3442ab3a5b523a8dfa7a3

Fix IAR trying to use memset_s in platform_util

Signed-off-by: Agathiyan Bragadeesh <agathiyan.bragadeesh2@arm.com>

library/platform_util.c

diff --git a/library/platform_util.c b/library/platform_util.c
index e903f8e..608aac2 100644
--- a/library/platform_util.c
+++ b/library/platform_util.c
@@ -97,7 +97,8 @@
  * mbedtls_platform_zeroize() to use a suitable implementation for their
  * platform and needs.
  */
-#if !defined(MBEDTLS_PLATFORM_HAS_EXPLICIT_BZERO) && !defined(__STDC_LIB_EXT1__) \
+#if !defined(MBEDTLS_PLATFORM_HAS_EXPLICIT_BZERO) && !(defined(__STDC_LIB_EXT1__) && \
+    !defined(__IAR_SYSTEMS_ICC__)) \
     && !defined(_WIN32)
 static void *(*const volatile memset_func)(void *, int, size_t) = memset;
 #endif
@@ -118,7 +119,7 @@
          */
         __msan_unpoison(buf, len);
 #endif
-#elif defined(__STDC_LIB_EXT1__)
+#elif defined(__STDC_LIB_EXT1__) && !defined(__IAR_SYSTEMS_ICC__)
         memset_s(buf, len, 0, len);
 #elif defined(_WIN32)
         SecureZeroMemory(buf, len);