Split off the keyed interfaces of transform to Keyed_Transform

Remove the unhelpful 'Algorithm' base class which had previously
acted more or less as a global base.

2 files changed, 5 insertions, 3 deletions

diff --git a/src/lib/hash/hash.h b/src/lib/hash/hash.h
index 1e4b045e2..58a810c4b 100644
--- a/src/lib/hash/hash.h
+++ b/src/lib/hash/hash.h
@@ -9,7 +9,6 @@
 #define BOTAN_HASH_FUNCTION_BASE_CLASS_H__
 
 #include <botan/buf_comp.h>
-#include <botan/algo_base.h>
 #include <string>
 
 namespace Botan {
@@ -17,8 +16,7 @@ namespace Botan {
 /**
 * This class represents hash function (message digest) objects
 */
-class BOTAN_DLL HashFunction : public Buffered_Computation,
-                               public Algorithm
+class BOTAN_DLL HashFunction : public Buffered_Computation
    {
    public:
       /**
@@ -26,6 +24,10 @@ class BOTAN_DLL HashFunction : public Buffered_Computation,
       */
       virtual HashFunction* clone() const = 0;
 
+      virtual void clear() = 0;
+
+      virtual std::string name() const = 0;
+
       /**
       * @return hash block size as defined for this algorithm
       */
diff --git a/src/lib/hash/whirlpool/whrlpool.cpp b/src/lib/hash/whirlpool/whirlpool.cpp
index 5356252b2..5356252b2 100644
--- a/src/lib/hash/whirlpool/whrlpool.cpp
+++ b/src/lib/hash/whirlpool/whirlpool.cpp