diff options
| author | Jack Lloyd <[email protected]> | 2015-09-21 17:23:45 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2015-09-21 17:23:45 -0400 |
| commit | b999079ebdfd1c9bd288763ae06dfdf6a31325e0 (patch) | |
| tree | b68ccafd36b7d9c9b07042e31ddd44908876584f /src/lib/block/block_cipher.cpp | |
| parent | 4a82605e745cf9a288806b31929ec0fe7c0c1bdc (diff) | |
Move check for SIMD instructions to CPUID
Avoids needing to include simd_32 to see if SIMD is disabled. This
had caused a build break on Linux x86-32 as SSE2 must be enabled on
a per-file basis.
Diffstat (limited to 'src/lib/block/block_cipher.cpp')
| -rw-r--r-- | src/lib/block/block_cipher.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/lib/block/block_cipher.cpp b/src/lib/block/block_cipher.cpp index 5b9c4f0ba..7b52f8716 100644 --- a/src/lib/block/block_cipher.cpp +++ b/src/lib/block/block_cipher.cpp @@ -9,10 +9,6 @@ #include <botan/cpuid.h> #include <botan/internal/algo_registry.h> -#if defined(BOTAN_HAS_SIMD_32) - #include <botan/internal/simd_32.h> -#endif - #if defined(BOTAN_HAS_AES) #include <botan/aes.h> #endif @@ -249,7 +245,7 @@ BOTAN_REGISTER_BLOCK_CIPHER_NOARGS(Noekeon); #endif #if defined(BOTAN_HAS_NOEKEON_SIMD) -BOTAN_REGISTER_BLOCK_CIPHER_NOARGS_IF(SIMD_32::enabled(), Noekeon_SIMD, "Noekeon", +BOTAN_REGISTER_BLOCK_CIPHER_NOARGS_IF(CPUID::has_simd_32(), Noekeon_SIMD, "Noekeon", "simd32", BOTAN_SIMD_ALGORITHM_PRIO); #endif @@ -278,7 +274,7 @@ BOTAN_REGISTER_BLOCK_CIPHER_NOARGS(Serpent); #endif #if defined(BOTAN_HAS_SERPENT_SIMD) -BOTAN_REGISTER_BLOCK_CIPHER_NOARGS_IF(SIMD_32::enabled(), Serpent_SIMD, "Serpent", +BOTAN_REGISTER_BLOCK_CIPHER_NOARGS_IF(CPUID::has_simd_32(), Serpent_SIMD, "Serpent", "simd32", BOTAN_SIMD_ALGORITHM_PRIO); #endif @@ -304,7 +300,7 @@ BOTAN_REGISTER_BLOCK_CIPHER_NOARGS(XTEA); #endif #if defined(BOTAN_HAS_XTEA_SIMD) -BOTAN_REGISTER_BLOCK_CIPHER_NOARGS_IF(SIMD_32::enabled(), XTEA_SIMD, "XTEA", +BOTAN_REGISTER_BLOCK_CIPHER_NOARGS_IF(CPUID::has_simd_32(), XTEA_SIMD, "XTEA", "simd32", BOTAN_SIMD_ALGORITHM_PRIO); #endif |