From d0ea7b549e31450897a6a3ee0372c2fbf995cf49 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Sat, 14 Mar 2020 15:56:08 +0100 Subject: [PATCH] Remove XOP stub XOP is dead --- .../sse/pwhash_scryptsalsa208sha256_sse.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/libsodium/crypto_pwhash/scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c b/src/libsodium/crypto_pwhash/scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c index 4304d170..ee2aa511 100644 --- a/src/libsodium/crypto_pwhash/scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c +++ b/src/libsodium/crypto_pwhash/scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c @@ -50,17 +50,12 @@ # include "../crypto_scrypt.h" # include "../pbkdf2-sha256.h" -# if defined(__XOP__) && defined(DISABLED) -# define ARX(out, in1, in2, s) \ - out = _mm_xor_si128(out, _mm_roti_epi32(_mm_add_epi32(in1, in2), s)); -# else -# define ARX(out, in1, in2, s) \ +# define ARX(out, in1, in2, s) \ { \ __m128i T = _mm_add_epi32(in1, in2); \ out = _mm_xor_si128(out, _mm_slli_epi32(T, s)); \ out = _mm_xor_si128(out, _mm_srli_epi32(T, 32 - s)); \ } -# endif # define SALSA20_2ROUNDS \ /* Operate on "columns". */ \