Split the assembly implementations of the hash functions into asm_engine.

This still is not an ideal split, since for SHA-1 we have both SSE2 and
x86/x86-64 asm. Currently we continue to punt to SSE2 if enabled, otherwise
asm, since the SSE2 seems to be the fastest thing going in my tests so far.

1 files changed, 11 insertions, 1 deletions

diff --git a/src/libstate/modules.cpp b/src/libstate/modules.cpp
index 8db202ddf..81508116d 100644
--- a/src/libstate/modules.cpp
+++ b/src/libstate/modules.cpp
@@ -5,7 +5,6 @@
 
 #include <botan/modules.h>
 #include <botan/defalloc.h>
-#include <botan/def_eng.h>
 #include <botan/parsing.h>
 
 #if defined(BOTAN_HAS_MUTEX_PTHREAD)
@@ -24,6 +23,13 @@
   #include <botan/mmap_mem.h>
 #endif
 
+// Default engine
+#include <botan/def_eng.h>
+
+#if defined(BOTAN_HAS_ENGINE_ASSEMBLER)
+  #include <botan/asm_engine.h>
+#endif
+
 #if defined(BOTAN_HAS_ENGINE_GNU_MP)
   #include <botan/eng_gmp.h>
 #endif
@@ -107,6 +113,10 @@ std::vector<Engine*> Builtin_Modules::engines() const
 #if defined(BOTAN_HAS_ENGINE_OPENSSL)
       engines.push_back(new OpenSSL_Engine);
 #endif
+
+#if defined(BOTAN_HAS_ENGINE_ASSEMBLER)
+      engines.push_back(new Assembler_Engine);
+#endif
       }
 
    engines.push_back(new Default_Engine);