mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-30 16:20:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add compiler version checks.

Browse Source 
When `MBEDTLS_AESCE_C` enabled and the compiler
is not expected, we should raise error to user.

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2023-04-26 11:06:51 +08:00
parent a1a039dba6
commit 61c4cfa2a7
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
library/aesce.c
View File

@ -48,23 +48,28 @@
#if defined(MBEDTLS_HAVE_ARM64) #if defined(MBEDTLS_HAVE_ARM64)
/* Compiler version checks. */
#if defined(__clang__) && (__clang_major__ < 4)
# error "Minimum version of Clang for MBEDTLS_AESCE_C is 4.0."
#elif defined(__GNUC__) && (__GNUC__ < 6)
# error "Minimum version of GCC for MBEDTLS_AESCE_C is 6.0."
#elif defined(_MSC_VER) && (_MSC_VER < 1929)
/* TODO: We haven't verified MSVC from 1920 to 1928. If someone verified that,
* please update this and document of `MBEDTLS_AESCE_C` in
* `mbedtls_config.h`. */
# error "Minimum version of MSVC for MBEDTLS_AESCE_C is 2019 version 16.11.2."
#endif
#if !defined(__ARM_FEATURE_AES) || defined(MBEDTLS_ENABLE_ARM_CRYPTO_EXTENSIONS_COMPILER_FLAG) #if !defined(__ARM_FEATURE_AES) || defined(MBEDTLS_ENABLE_ARM_CRYPTO_EXTENSIONS_COMPILER_FLAG)
# if defined(__clang__) # if defined(__clang__)
# if __clang_major__ < 4
# error "A more recent Clang is required for MBEDTLS_AESCE_C"
# endif
# pragma clang attribute push (__attribute__((target("crypto"))), apply_to=function) # pragma clang attribute push (__attribute__((target("crypto"))), apply_to=function)
# define MBEDTLS_POP_TARGET_PRAGMA # define MBEDTLS_POP_TARGET_PRAGMA
# elif defined(__GNUC__) # elif defined(__GNUC__)
# if __GNUC__ < 6
# error "A more recent GCC is required for MBEDTLS_AESCE_C"
# endif
# pragma GCC push_options # pragma GCC push_options
# pragma GCC target ("arch=armv8-a+crypto") # pragma GCC target ("arch=armv8-a+crypto")
# define MBEDTLS_POP_TARGET_PRAGMA # define MBEDTLS_POP_TARGET_PRAGMA
# elif defined(_MSC_VER) # elif defined(_MSC_VER)
# else # error "Required feature(__ARM_FEATURE_AES) is not enabled."
# error "Only MSVC, GCC and Clang supported for MBEDTLS_AESCE_C"
# endif # endif
#endif /* !__ARM_FEATURE_AES || MBEDTLS_ENABLE_ARM_CRYPTO_EXTENSIONS_COMPILER_FLAG */ #endif /* !__ARM_FEATURE_AES || MBEDTLS_ENABLE_ARM_CRYPTO_EXTENSIONS_COMPILER_FLAG */

13
library/aesce.h
View File

@ -31,22 +31,11 @@
#include "mbedtls/aes.h" #include "mbedtls/aes.h"
#if !defined(MBEDTLS_HAVE_ARM64) #if !defined(MBEDTLS_HAVE_ARM64)
#if defined(__GNUC__) && defined(__aarch64__) #if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
#define MBEDTLS_HAVE_ARM64
#endif
/* MSVC
* TODO: We haven't verified msvc from 1920 to 1928. If someone verified that,
* please update this and document of `MBEDTLS_AESCE_C` in
* `mbedtls_config.h`
*/
#if defined(_MSC_VER) && _MSC_VER >=1929 && \
(defined(_M_ARM64) || defined(_M_ARM64EC))
#define MBEDTLS_HAVE_ARM64 #define MBEDTLS_HAVE_ARM64
#endif #endif
#endif #endif
#if defined(MBEDTLS_HAVE_ARM64) #if defined(MBEDTLS_HAVE_ARM64)
#ifdef __cplusplus #ifdef __cplusplus