cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Require/enable AVX for AES256-GCM

Browse Source
This commit is contained in:
Frank Denis 2023-08-05 09:39:11 +02:00
parent 1686b524ab
commit 4388ef37db
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libsodium/Makefile.am
View File

@ -214,7 +214,7 @@ endif
libaesni_la_LDFLAGS = $(libsodium_la_LDFLAGS) libaesni_la_LDFLAGS = $(libsodium_la_LDFLAGS)
libaesni_la_CPPFLAGS = $(libsodium_la_CPPFLAGS) \ libaesni_la_CPPFLAGS = $(libsodium_la_CPPFLAGS) \
@CFLAGS_SSE2@ @CFLAGS_SSSE3@ @CFLAGS_AESNI@ @CFLAGS_PCLMUL@ @CFLAGS_SSE2@ @CFLAGS_SSSE3@ @CFLAGS_AVX@ @CFLAGS_AESNI@ @CFLAGS_PCLMUL@
libaesni_la_SOURCES = \ libaesni_la_SOURCES = \
crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c

2
src/libsodium/Makefile.in
View File

@ -1035,7 +1035,7 @@ librdrand_la_SOURCES = \
libaesni_la_LDFLAGS = $(libsodium_la_LDFLAGS) libaesni_la_LDFLAGS = $(libsodium_la_LDFLAGS)
libaesni_la_CPPFLAGS = $(libsodium_la_CPPFLAGS) \ libaesni_la_CPPFLAGS = $(libsodium_la_CPPFLAGS) \
@CFLAGS_SSE2@ @CFLAGS_SSSE3@ @CFLAGS_AESNI@ @CFLAGS_PCLMUL@ @CFLAGS_SSE2@ @CFLAGS_SSSE3@ @CFLAGS_AVX@ @CFLAGS_AESNI@ @CFLAGS_PCLMUL@
libaesni_la_SOURCES = \ libaesni_la_SOURCES = \
crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c

6
src/libsodium/crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c
View File

@ -17,9 +17,7 @@
#if defined(HAVE_TMMINTRIN_H) && defined(HAVE_WMMINTRIN_H) #if defined(HAVE_TMMINTRIN_H) && defined(HAVE_WMMINTRIN_H)
#ifdef __GNUC__ #ifdef __GNUC__
#pragma GCC target("ssse3") #pragma GCC target("aes,pclmul,avx")
#pragma GCC target("aes")
#pragma GCC target("pclmul")
#endif #endif
#if !defined(_MSC_VER) || _MSC_VER < 1800 #if !defined(_MSC_VER) || _MSC_VER < 1800
@ -996,7 +994,7 @@ crypto_aead_aes256gcm_decrypt(unsigned char *m, unsigned long long *mlen_p, unsi
int int
crypto_aead_aes256gcm_is_available(void) crypto_aead_aes256gcm_is_available(void)
{ {
return sodium_runtime_has_pclmul() & sodium_runtime_has_aesni(); return sodium_runtime_has_pclmul() & sodium_runtime_has_aesni() & sodium_runtime_has_avx();
} }
#else #else