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

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

1 files changed, 15 insertions, 0 deletions

diff --git a/src/engine/def_engine/lookup_hash.cpp b/src/engine/def_engine/lookup_hash.cpp
index 4ce7915d4..1d96d4f3f 100644
--- a/src/engine/def_engine/lookup_hash.cpp
+++ b/src/engine/def_engine/lookup_hash.cpp
@@ -83,6 +83,10 @@
   #include <botan/par_hash.h>
 #endif
 
+#if defined(BOTAN_HAS_COMB4P)
+  #include <botan/comb4p.h>
+#endif
+
 namespace Botan {
 
 /*
@@ -185,6 +189,17 @@ Default_Engine::find_hash(const SCAN_Name& request,
       return new Whirlpool;
 #endif
 
+#if defined(BOTAN_HAS_COMB4P)
+   if(request.algo_name() == "Comb4P" && request.arg_count() == 2)
+      {
+      const HashFunction* h1 = af.prototype_hash_function(request.arg(0));
+      const HashFunction* h2 = af.prototype_hash_function(request.arg(1));
+
+      if(h1 && h2)
+         return new Comb4P(h1->clone(), h2->clone());
+      }
+#endif
+
 #if defined(BOTAN_HAS_PARALLEL_HASH)
 
    if(request.algo_name() == "Parallel")