mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-18 23:42:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8079 from adeaarm/port_IAR_build_fix

Browse Source 
Small fixes for IAR support
This commit is contained in:
Gilles Peskine 2023-08-17 19:10:51 +00:00 committed by GitHub
commit eeaad50cd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -226,7 +226,9 @@ if(CMAKE_COMPILER_IS_CLANG)
endif(CMAKE_COMPILER_IS_CLANG) endif(CMAKE_COMPILER_IS_CLANG)
if(CMAKE_COMPILER_IS_IAR) if(CMAKE_COMPILER_IS_IAR)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --warn_about_c_style_casts -Ohz") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --warn_about_c_style_casts")
set(CMAKE_C_FLAGS_RELEASE "-Ohz")
set(CMAKE_C_FLAGS_DEBUG "--debug -On")
endif(CMAKE_COMPILER_IS_IAR) endif(CMAKE_COMPILER_IS_IAR)
if(CMAKE_COMPILER_IS_MSVC) if(CMAKE_COMPILER_IS_MSVC)

2
library/aes.c
View File

@ -1866,7 +1866,7 @@ int mbedtls_aes_self_test(int verbose)
#elif MBEDTLS_AESNI_HAVE_CODE == 2 #elif MBEDTLS_AESNI_HAVE_CODE == 2
mbedtls_printf(" AES note: AESNI code present (intrinsics implementation).\n"); mbedtls_printf(" AES note: AESNI code present (intrinsics implementation).\n");
#else #else
#error Unrecognised value for MBEDTLS_AESNI_HAVE_CODE #error "Unrecognised value for MBEDTLS_AESNI_HAVE_CODE"
#endif #endif
if (mbedtls_aesni_has_support(MBEDTLS_AESNI_AES)) { if (mbedtls_aesni_has_support(MBEDTLS_AESNI_AES)) {
mbedtls_printf(" AES note: using AESNI.\n"); mbedtls_printf(" AES note: using AESNI.\n");

2
library/common.h
View File

@ -288,7 +288,7 @@ static inline void mbedtls_xor_no_simd(unsigned char *r,
/* Normal case (64-bit pointers): use "r" as the constraint for pointer operands to asm */ /* Normal case (64-bit pointers): use "r" as the constraint for pointer operands to asm */
#define MBEDTLS_ASM_AARCH64_PTR_CONSTRAINT "r" #define MBEDTLS_ASM_AARCH64_PTR_CONSTRAINT "r"
#else #else
#error Unrecognised pointer size for aarch64 #error "Unrecognised pointer size for aarch64"
#endif #endif
#endif #endif

2
library/constant_time.c
View File

@ -82,7 +82,7 @@ static inline uint32_t mbedtls_get_unaligned_volatile_uint32(volatile const unsi
#elif defined(MBEDTLS_CT_AARCH64_ASM) #elif defined(MBEDTLS_CT_AARCH64_ASM)
asm volatile ("ldr %w0, [%1]" : "=r" (r) : MBEDTLS_ASM_AARCH64_PTR_CONSTRAINT(p) :); asm volatile ("ldr %w0, [%1]" : "=r" (r) : MBEDTLS_ASM_AARCH64_PTR_CONSTRAINT(p) :);
#else #else
#error No assembly defined for mbedtls_get_unaligned_volatile_uint32 #error "No assembly defined for mbedtls_get_unaligned_volatile_uint32"
#endif #endif
return r; return r;
} }

2
library/entropy_poll.c
View File

@ -75,7 +75,7 @@ int mbedtls_platform_entropy_poll(void *data, unsigned char *output, size_t len,
return 0; return 0;
} }
#else /* !_WIN32_WINNT_WINXP */ #else /* !_WIN32_WINNT_WINXP */
#error Entropy not available before Windows XP, use MBEDTLS_NO_PLATFORM_ENTROPY #error "Entropy not available before Windows XP, use MBEDTLS_NO_PLATFORM_ENTROPY"
#endif /* !_WIN32_WINNT_WINXP */ #endif /* !_WIN32_WINNT_WINXP */
#else /* _WIN32 && !EFIX64 && !EFI32 */ #else /* _WIN32 && !EFIX64 && !EFI32 */

2
library/psa_crypto_storage.h
View File

@ -39,7 +39,7 @@ extern "C" {
/* Sanity check: a file size must fit in 32 bits. Allow a generous /* Sanity check: a file size must fit in 32 bits. Allow a generous
* 64kB of metadata. */ * 64kB of metadata. */
#if PSA_CRYPTO_MAX_STORAGE_SIZE > 0xffff0000 #if PSA_CRYPTO_MAX_STORAGE_SIZE > 0xffff0000
#error PSA_CRYPTO_MAX_STORAGE_SIZE > 0xffff0000 #error "PSA_CRYPTO_MAX_STORAGE_SIZE > 0xffff0000"
#endif #endif
/** The maximum permitted persistent slot number. /** The maximum permitted persistent slot number.

2
library/x509_crt.c
View File

@ -1599,7 +1599,7 @@ int mbedtls_x509_crt_parse_path(mbedtls_x509_crt *chain, const char *path)
cleanup: cleanup:
FindClose(hFind); FindClose(hFind);
#else /* !_WIN32_WINNT_XP */ #else /* !_WIN32_WINNT_XP */
#error mbedtls_x509_crt_parse_path not available before Windows XP #error "mbedtls_x509_crt_parse_path not available before Windows XP"
#endif /* !_WIN32_WINNT_XP */ #endif /* !_WIN32_WINNT_XP */
#else /* _WIN32 */ #else /* _WIN32 */
int t_ret; int t_ret;