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

Simplify Windows-on-Arm macros

Browse Source 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman 2023-09-15 11:52:06 +01:00
parent c5cc727dd0
commit 0a48717b83
6 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/mbedtls/build_info.h
View File

@ -74,6 +74,10 @@
#define MBEDTLS_ARCH_IS_X86 #define MBEDTLS_ARCH_IS_X86
#endif #endif
#if defined(_M_ARM64) || defined(_M_ARM64EC)
#define MBEDTLS_PLATFORM_IS_WINDOWS_ON_ARM64
#endif
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE) #if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
#define _CRT_SECURE_NO_DEPRECATE 1 #define _CRT_SECURE_NO_DEPRECATE 1
#endif #endif

2
library/alignment.h
View File

@ -36,7 +36,7 @@
*/ */
#if defined(__ARM_FEATURE_UNALIGNED) \ #if defined(__ARM_FEATURE_UNALIGNED) \
|| defined(MBEDTLS_ARCH_IS_X86) || defined(MBEDTLS_ARCH_IS_X64) \ || defined(MBEDTLS_ARCH_IS_X86) || defined(MBEDTLS_ARCH_IS_X64) \
|| defined(_M_ARM64) || defined(_M_ARM64EC) || defined(MBEDTLS_PLATFORM_IS_WINDOWS_ON_ARM64)
/* /*
* __ARM_FEATURE_UNALIGNED is defined where appropriate by armcc, gcc 7, clang 9 * __ARM_FEATURE_UNALIGNED is defined where appropriate by armcc, gcc 7, clang 9
* (and later versions) for Arm v7 and later; all x86 platforms should have * (and later versions) for Arm v7 and later; all x86 platforms should have

3
library/bignum.c
View File

@ -114,7 +114,8 @@ int mbedtls_mpi_lt_mpi_ct(const mbedtls_mpi *X,
* about whether the assignment was made or not. * about whether the assignment was made or not.
* (Leaking information about the respective sizes of X and Y is ok however.) * (Leaking information about the respective sizes of X and Y is ok however.)
*/ */
#if defined(_MSC_VER) && defined(_M_ARM64) && (_MSC_FULL_VER < 193131103) #if defined(_MSC_VER) && defined(MBEDTLS_PLATFORM_IS_WINDOWS_ON_ARM64) && \
(_MSC_FULL_VER < 193131103)
/* /*
* MSVC miscompiles this function if it's inlined prior to Visual Studio 2022 version 17.1. See: * MSVC miscompiles this function if it's inlined prior to Visual Studio 2022 version 17.1. See:
* https://developercommunity.visualstudio.com/t/c-compiler-miscompiles-part-of-mbedtls-library-on/1646989 * https://developercommunity.visualstudio.com/t/c-compiler-miscompiles-part-of-mbedtls-library-on/1646989

4
library/common.h
View File

@ -34,9 +34,7 @@
#if defined(__ARM_NEON) #if defined(__ARM_NEON)
#include <arm_neon.h> #include <arm_neon.h>
#define MBEDTLS_HAVE_NEON_INTRINSICS #define MBEDTLS_HAVE_NEON_INTRINSICS
#endif /* __ARM_NEON */ #elif defined(MBEDTLS_PLATFORM_IS_WINDOWS_ON_ARM64)
#if defined(_M_ARM64) || defined(_M_ARM64EC)
#include <arm64_neon.h> #include <arm64_neon.h>
#define MBEDTLS_HAVE_NEON_INTRINSICS #define MBEDTLS_HAVE_NEON_INTRINSICS
#endif #endif

4
library/sha256.c
View File

@ -108,7 +108,7 @@
# include <signal.h> # include <signal.h>
# endif # endif
# endif # endif
#elif !(defined(_M_ARM64) || defined(_M_ARM64EC)) #elif !defined(MBEDTLS_PLATFORM_IS_WINDOWS_ON_ARM64)
# undef MBEDTLS_SHA256_USE_A64_CRYPTO_ONLY # undef MBEDTLS_SHA256_USE_A64_CRYPTO_ONLY
# undef MBEDTLS_SHA256_USE_A64_CRYPTO_IF_PRESENT # undef MBEDTLS_SHA256_USE_A64_CRYPTO_IF_PRESENT
#endif #endif
@ -128,7 +128,7 @@ static int mbedtls_a64_crypto_sha256_determine_support(void)
{ {
return 1; return 1;
} }
#elif defined(_M_ARM64) || defined(_M_ARM64EC) #elif defined(MBEDTLS_PLATFORM_IS_WINDOWS_ON_ARM64)
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <Windows.h> #include <Windows.h>
#include <processthreadsapi.h> #include <processthreadsapi.h>

9
library/sha512.c
View File

@ -119,12 +119,7 @@
# include <signal.h> # include <signal.h>
# endif # endif
# endif # endif
#elif defined(_M_ARM64) #elif !defined(MBEDTLS_PLATFORM_IS_WINDOWS_ON_ARM64)
# if defined(MBEDTLS_SHA512_USE_A64_CRYPTO_IF_PRESENT) || \
defined(MBEDTLS_SHA512_USE_A64_CRYPTO_ONLY)
# include <arm64_neon.h>
# endif
#else
# undef MBEDTLS_SHA512_USE_A64_CRYPTO_ONLY # undef MBEDTLS_SHA512_USE_A64_CRYPTO_ONLY
# undef MBEDTLS_SHA512_USE_A64_CRYPTO_IF_PRESENT # undef MBEDTLS_SHA512_USE_A64_CRYPTO_IF_PRESENT
#endif #endif
@ -152,7 +147,7 @@ static int mbedtls_a64_crypto_sha512_determine_support(void)
NULL, 0); NULL, 0);
return ret == 0 && value != 0; return ret == 0 && value != 0;
} }
#elif defined(_M_ARM64) || defined(_M_ARM64EC) #elif defined(MBEDTLS_PLATFORM_IS_WINDOWS_ON_ARM64)
/* /*
* As of March 2022, there don't appear to be any PF_ARM_V8_* flags * As of March 2022, there don't appear to be any PF_ARM_V8_* flags
* available to pass to IsProcessorFeaturePresent() to check for * available to pass to IsProcessorFeaturePresent() to check for