From c210fd558e2f34dcecdfd56c854c07f2b7cede43 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Wed, 24 Jul 2019 00:18:06 +0200 Subject: [PATCH] Revert "Revert "Disable AVX512 Argon2 implementation on MacOS"" This reverts commit 495ebc26f6c377000ef2a2f58f3c0ebe2e596b9a. --- src/libsodium/crypto_pwhash/argon2/argon2-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libsodium/crypto_pwhash/argon2/argon2-core.c b/src/libsodium/crypto_pwhash/argon2/argon2-core.c index 3108fb8f..26d8d0f0 100644 --- a/src/libsodium/crypto_pwhash/argon2/argon2-core.c +++ b/src/libsodium/crypto_pwhash/argon2/argon2-core.c @@ -523,7 +523,8 @@ argon2_pick_best_implementation(void) { /* LCOV_EXCL_START */ #if defined(HAVE_AVX512FINTRIN_H) && defined(HAVE_AVX2INTRIN_H) && \ - defined(HAVE_TMMINTRIN_H) && defined(HAVE_SMMINTRIN_H) + defined(HAVE_TMMINTRIN_H) && defined(HAVE_SMMINTRIN_H) && \ + !defined(__APPLE__) if (sodium_runtime_has_avx512f()) { fill_segment = argon2_fill_segment_avx512f; return 0;