3 files changed, 40 insertions, 5 deletions
diff --git a/src/engine/sse2_eng/eng_sse2.cpp b/src/engine/sse2_eng/eng_sse2.cpp
index c738b3d96..07c625c7c 100644
--- a/src/engine/sse2_eng/eng_sse2.cpp
+++ b/src/engine/sse2_eng/eng_sse2.cpp
@@ -1,21 +1,45 @@
 /**
 * SSE2 Assembly Engine
-* (C) 1999-2008 Jack Lloyd
+* (C) 1999-2009 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
 */
 
 #include <botan/eng_sse2.h>
+#include <botan/cpuid.h>
 
 #if defined(BOTAN_HAS_SHA1_SSE2)
   #include <botan/sha1_sse2.h>
 #endif
 
+#if defined(BOTAN_HAS_SERPENT_SSE2)
+  #include <botan/serp_sse2.h>
+#endif
+
 namespace Botan {
 
-HashFunction* SSE2_Assembler_Engine::find_hash(const SCAN_Name& request,
-                                               Algorithm_Factory&) const
+BlockCipher*
+SSE2_Assembler_Engine::find_block_cipher(const SCAN_Name& request,
+                                         Algorithm_Factory&) const
+   {
+   if(!CPUID::has_sse2())
+      return 0;
+
+#if defined(BOTAN_HAS_SERPENT_SSE2)
+   if(request.algo_name() == "Serpent")
+      return new Serpent_SSE2;
+#endif
+
+   return 0;
+   }
+
+HashFunction*
+SSE2_Assembler_Engine::find_hash(const SCAN_Name& request,
+                                 Algorithm_Factory&) const
    {
+   if(!CPUID::has_sse2())
+      return 0;
+
 #if defined(BOTAN_HAS_SHA1_SSE2)
    if(request.algo_name() == "SHA-160")
       return new SHA_160_SSE2;
diff --git a/src/engine/sse2_eng/eng_sse2.h b/src/engine/sse2_eng/eng_sse2.h
index 129697e8f..c6b0ce889 100644
--- a/src/engine/sse2_eng/eng_sse2.h
+++ b/src/engine/sse2_eng/eng_sse2.h
@@ -1,6 +1,6 @@
 /**
 * SSE2 Assembly Engine
-* (C) 1999-2008 Jack Lloyd
+* (C) 1999-2009 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
 */
@@ -17,6 +17,9 @@ class BOTAN_DLL SSE2_Assembler_Engine : public Engine
    public:
       std::string provider_name() const { return "sse2"; }
    private:
+      BlockCipher* find_block_cipher(const SCAN_Name&,
+                                     Algorithm_Factory&) const;
+
       HashFunction* find_hash(const SCAN_Name& reqeust,
                               Algorithm_Factory&) const;
    };
diff --git a/src/engine/sse2_eng/info.txt b/src/engine/sse2_eng/info.txt
index 6242c7fee..7508b9874 100644
--- a/src/engine/sse2_eng/info.txt
+++ b/src/engine/sse2_eng/info.txt
@@ -10,6 +10,14 @@ eng_sse2.h
 </add>
 
 <arch>
-ia32
+pentium-m
+pentium4
+prescott
 amd64
 </arch>
+
+<cc>
+gcc
+icc
+msvc
+</cc>