propagate from branch 'net.randombit.botan' (head ac4d8fecb28374d06094da3457aa1e23f77dfa52)

            to branch 'net.randombit.botan.c++0x' (head 00f0eecf3374a14b6ab907bd235488f902608de4)

1 files changed, 4 insertions, 0 deletions

diff --git a/src/engine/simd_engine/simd_engine.cpp b/src/engine/simd_engine/simd_engine.cpp
index 7e15f9ec1..fdb1644d0 100644
--- a/src/engine/simd_engine/simd_engine.cpp
+++ b/src/engine/simd_engine/simd_engine.cpp
@@ -6,6 +6,7 @@
 */
 
 #include <botan/simd_engine.h>
+#include <botan/simd_32.h>
 #include <botan/cpuid.h>
 
 #if defined(BOTAN_HAS_SERPENT_SIMD)
@@ -26,6 +27,9 @@ BlockCipher*
 SIMD_Engine::find_block_cipher(const SCAN_Name& request,
                                Algorithm_Factory&) const
    {
+   if(!SIMD_32::enabled())
+      return 0;
+
 #if defined(BOTAN_HAS_SERPENT_SIMD)
    if(request.algo_name() == "Serpent")
       return new Serpent_SIMD;