diff options
| author | lloyd <[email protected]> | 2009-12-24 21:38:25 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-12-24 21:38:25 +0000 |
| commit | 8e0c38eff91fc6c3df5cc0104704baa75149898e (patch) | |
| tree | e6d79db18899068f8cfa77f2455f00c86d86b6ef /src/engine | |
| parent | c85c79ac51b5829258dae7e51bb472b740da9574 (diff) | |
| parent | a48ae8f6c1aa605acbed76e9e2f1d6c2dcdd3d1e (diff) | |
propagate from branch 'net.randombit.botan' (head 367d157c1221a162f5b4098492944a509ef6d019)
to branch 'net.randombit.botan.c++0x' (head 1b9e8c4e92663f30b7d57b0fd8f57eb13cfce155)
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/simd_engine/simd_engine.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/engine/simd_engine/simd_engine.cpp b/src/engine/simd_engine/simd_engine.cpp index 892221f22..b8ebd6a80 100644 --- a/src/engine/simd_engine/simd_engine.cpp +++ b/src/engine/simd_engine/simd_engine.cpp @@ -17,6 +17,10 @@ #include <botan/xtea_simd.h> #endif +#if defined(BOTAN_HAS_IDEA_SSE2) + #include <botan/idea_sse2.h> +#endif + #if defined(BOTAN_HAS_SHA1_SSE2) #include <botan/sha1_sse2.h> #endif @@ -27,16 +31,18 @@ BlockCipher* SIMD_Engine::find_block_cipher(const SCAN_Name& request, Algorithm_Factory&) const { - if(!SIMD_32::enabled()) - return 0; +#if defined(BOTAN_HAS_IDEA_SSE2) + if(request.algo_name() == "IDEA" && CPUID::has_sse2()) + return new IDEA_SSE2; +#endif #if defined(BOTAN_HAS_SERPENT_SIMD) - if(request.algo_name() == "Serpent") + if(request.algo_name() == "Serpent" && SIMD_32::enabled()) return new Serpent_SIMD; #endif #if defined(BOTAN_HAS_XTEA_SIMD) - if(request.algo_name() == "XTEA") + if(request.algo_name() == "XTEA" && SIMD_32::enabled()) return new XTEA_SIMD; #endif |