propagate from branch 'net.randombit.botan' (head 8fb69dd1c599ada1008c4cab2a6d502cbcc468e0)

            to branch 'net.randombit.botan.general-simd' (head c05c9a6d398659891fb8cca170ed514ea7e6476d)

3 files changed, 86 insertions, 0 deletions

diff --git a/src/engine/simd_engine/info.txt b/src/engine/simd_engine/info.txt
new file mode 100644
index 000000000..b0523285f
--- /dev/null
+++ b/src/engine/simd_engine/info.txt
@@ -0,0 +1,3 @@
+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/simd_engine/simd_engine.h b/src/engine/simd_engine/simd_engine.h
new file mode 100644
index 000000000..f7df6ff77
--- /dev/null
+++ b/src/engine/simd_engine/simd_engine.h
@@ -0,0 +1,29 @@
+/**
+* SIMD Assembly Engine
+* (C) 1999-2009 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#ifndef BOTAN_SIMD_ENGINE_H__
+#define BOTAN_SIMD_ENGINE_H__
+
+#include <botan/engine.h>
+
+namespace Botan {
+
+class BOTAN_DLL SIMD_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;
+   };
+
+}
+
+#endif