yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #8372 - Error compiling AESNI in Mbed-TLS with clang on Windows

Browse source 
It can successfully compile w/ the clang options -maes -mpclmul.

Signed-off-by: Sergey Markelov <sergey@solidstatenetworks.com>
This commit is contained in:
Sergey Markelov 2023-10-16 12:54:48 -07:00
parent 2fde39a22c
commit 3898f10fed
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog.d/8372.txt Normal file
View file

@ -0,0 +1,3 @@
Features
* AES-NI is now supported in Windows builds with clang and clang-cl.
Resolves #8372.

4
library/aesni.c
View file

@ -52,7 +52,7 @@ int mbedtls_aesni_has_support(unsigned int what)
if (!done) { if (!done) {
#if MBEDTLS_AESNI_HAVE_CODE == 2 #if MBEDTLS_AESNI_HAVE_CODE == 2
static unsigned info[4] = { 0, 0, 0, 0 }; static int info[4] = { 0, 0, 0, 0 };
#if defined(_MSC_VER) #if defined(_MSC_VER)
__cpuid(info, 1); __cpuid(info, 1);
#else #else
@ -187,7 +187,7 @@ void mbedtls_aesni_gcm_mult(unsigned char c[16],
const unsigned char a[16], const unsigned char a[16],
const unsigned char b[16]) const unsigned char b[16])
{ {
__m128i aa, bb, cc, dd; __m128i aa = { 0 }, bb = { 0 }, cc, dd;
/* The inputs are in big-endian order, so byte-reverse them */ /* The inputs are in big-endian order, so byte-reverse them */
for (size_t i = 0; i < 16; i++) { for (size_t i = 0; i < 16; i++) {

6
library/aesni.h
View file

@ -39,7 +39,7 @@
* (Only implemented with certain compilers, only for certain targets.) * (Only implemented with certain compilers, only for certain targets.)
*/ */
#undef MBEDTLS_AESNI_HAVE_INTRINSICS #undef MBEDTLS_AESNI_HAVE_INTRINSICS
#if defined(_MSC_VER) #if defined(_MSC_VER) && !defined(__clang__)
/* Visual Studio supports AESNI intrinsics since VS 2008 SP1. We only support /* Visual Studio supports AESNI intrinsics since VS 2008 SP1. We only support
* VS 2013 and up for other reasons anyway, so no need to check the version. */ * VS 2013 and up for other reasons anyway, so no need to check the version. */
#define MBEDTLS_AESNI_HAVE_INTRINSICS #define MBEDTLS_AESNI_HAVE_INTRINSICS
@ -47,7 +47,7 @@
/* GCC-like compilers: currently, we only support intrinsics if the requisite /* GCC-like compilers: currently, we only support intrinsics if the requisite
* target flag is enabled when building the library (e.g. `gcc -mpclmul -msse2` * target flag is enabled when building the library (e.g. `gcc -mpclmul -msse2`
* or `clang -maes -mpclmul`). */ * or `clang -maes -mpclmul`). */
#if defined(__GNUC__) && defined(__AES__) && defined(__PCLMUL__) #if (defined(__GNUC__) || defined(__clang__)) && defined(__AES__) && defined(__PCLMUL__)
#define MBEDTLS_AESNI_HAVE_INTRINSICS #define MBEDTLS_AESNI_HAVE_INTRINSICS
#endif #endif
@ -65,7 +65,7 @@
* (Only implemented with gas syntax, only for 64-bit.) * (Only implemented with gas syntax, only for 64-bit.)
*/ */
#define MBEDTLS_AESNI_HAVE_CODE 1 // via assembly #define MBEDTLS_AESNI_HAVE_CODE 1 // via assembly
#elif defined(__GNUC__) #elif defined(__GNUC__) || defined(__clang__)
# error "Must use `-mpclmul -msse2 -maes` for MBEDTLS_AESNI_C" # error "Must use `-mpclmul -msse2 -maes` for MBEDTLS_AESNI_C"
#else #else
#error "MBEDTLS_AESNI_C defined, but neither intrinsics nor assembly available" #error "MBEDTLS_AESNI_C defined, but neither intrinsics nor assembly available"