ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-05-10 08:59:05 +08:00
Code Issues Releases Wiki Activity

Merge pull request #7950 from AgathiyanB/fix-IAR-using-memset-s

Browse Source 
Fix IAR trying to use memset_s in platform_util
This commit is contained in:
Dave Rodgman 2023-07-19 10:01:58 +01:00 committed by GitHub
commit 131a22ef27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/platform_util.c
View File

@ -97,7 +97,8 @@
* mbedtls_platform_zeroize() to use a suitable implementation for their * mbedtls_platform_zeroize() to use a suitable implementation for their
* platform and needs. * 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) && !defined(_WIN32)
static void *(*const volatile memset_func)(void *, int, size_t) = memset; static void *(*const volatile memset_func)(void *, int, size_t) = memset;
#endif #endif
@ -118,7 +119,7 @@ void mbedtls_platform_zeroize(void *buf, size_t len)
*/ */
__msan_unpoison(buf, len); __msan_unpoison(buf, len);
#endif #endif
#elif defined(__STDC_LIB_EXT1__) #elif defined(__STDC_LIB_EXT1__) && !defined(__IAR_SYSTEMS_ICC__)
memset_s(buf, len, 0, len); memset_s(buf, len, 0, len);
#elif defined(_WIN32) #elif defined(_WIN32)
SecureZeroMemory(buf, len); SecureZeroMemory(buf, len);