5 files changed, 63 insertions, 87 deletions
diff --git a/src/engine/simd_engine/info.txt b/src/engine/simd_engine/info.txt
new file mode 100644
index 000000000..b19664491
--- /dev/null
+++ b/src/engine/simd_engine/info.txt
@@ -0,0 +1,5 @@
+realname "SIMD Engine"
+
+define ENGINE_SIMD
+
+load_on dep
diff --git a/src/engine/simd_engine/simd_engine.cpp b/src/engine/simd_engine/simd_engine.cpp
new file mode 100644
index 000000000..7e15f9ec1
--- /dev/null
+++ b/src/engine/simd_engine/simd_engine.cpp
@@ -0,0 +1,54 @@
+/**
+* SIMD Engine
+* (C) 1999-2009 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#include <botan/simd_engine.h>
+#include <botan/cpuid.h>
+
+#if defined(BOTAN_HAS_SERPENT_SIMD)
+  #include <botan/serp_simd.h>
+#endif
+
+#if defined(BOTAN_HAS_XTEA_SIMD)
+  #include <botan/xtea_simd.h>
+#endif
+
+#if defined(BOTAN_HAS_SHA1_SSE2)
+  #include <botan/sha1_sse2.h>
+#endif
+
+namespace Botan {
+
+BlockCipher*
+SIMD_Engine::find_block_cipher(const SCAN_Name& request,
+                               Algorithm_Factory&) const
+   {
+#if defined(BOTAN_HAS_SERPENT_SIMD)
+   if(request.algo_name() == "Serpent")
+      return new Serpent_SIMD;
+#endif
+
+#if defined(BOTAN_HAS_XTEA_SIMD)
+   if(request.algo_name() == "XTEA")
+      return new XTEA_SIMD;
+#endif
+
+   return 0;
+   }
+
+HashFunction*
+SIMD_Engine::find_hash(const SCAN_Name& request,
+                       Algorithm_Factory&) const
+   {
+#if defined(BOTAN_HAS_SHA1_SSE2)
+   if(request.algo_name() == "SHA-160" && CPUID::has_sse2())
+      return new SHA_160_SSE2;
+#endif
+
+   return 0;
+   }
+
+}
diff --git a/src/engine/sse2_eng/eng_sse2.h b/src/engine/simd_engine/simd_engine.h
index c6b0ce889..f7df6ff77 100644
--- a/src/engine/sse2_eng/eng_sse2.h
+++ b/src/engine/simd_engine/simd_engine.h
@@ -1,18 +1,18 @@
 /**
-* SSE2 Assembly Engine
+* SIMD Assembly Engine
 * (C) 1999-2009 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
 */
 
-#ifndef BOTAN_SSE2_ASM_ENGINE_H__
-#define BOTAN_SSE2_ASM_ENGINE_H__
+#ifndef BOTAN_SIMD_ENGINE_H__
+#define BOTAN_SIMD_ENGINE_H__
 
 #include <botan/engine.h>
 
 namespace Botan {
 
-class BOTAN_DLL SSE2_Assembler_Engine : public Engine
+class BOTAN_DLL SIMD_Engine : public Engine
    {
    public:
       std::string provider_name() const { return "sse2"; }
diff --git a/src/engine/sse2_eng/eng_sse2.cpp b/src/engine/sse2_eng/eng_sse2.cpp
deleted file mode 100644
index 51b7d04e3..000000000
--- a/src/engine/sse2_eng/eng_sse2.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
-* SSE2 Assembly Engine
-* (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
-
-#if defined(BOTAN_HAS_XTEA_SSE2)
-  #include <botan/xtea_sse2.h>
-#endif
-
-namespace Botan {
-
-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
-
-#if defined(BOTAN_HAS_XTEA_SSE2)
-   if(request.algo_name() == "XTEA")
-      return new XTEA_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;
-#endif
-
-   return 0;
-   }
-
-}
diff --git a/src/engine/sse2_eng/info.txt b/src/engine/sse2_eng/info.txt
deleted file mode 100644
index 7508b9874..000000000
--- a/src/engine/sse2_eng/info.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-realname "SSE2 Assembler Engine"
-
-define ENGINE_SSE2_ASSEMBLER
-
-load_on dep
-
-<add>
-eng_sse2.cpp
-eng_sse2.h
-</add>
-
-<arch>
-pentium-m
-pentium4
-prescott
-amd64
-</arch>
-
-<cc>
-gcc
-icc
-msvc
-</cc>