Add new top-level algorithm which provides basic functionality: name

query, clearing, and cloning. Applies to ciphers, hashes, MACs, and
PBKDFs. May extend to KDFs later as well.

A single combined hierarchy in particular will make the algo_factory
much simpler.

2 files changed, 4 insertions, 12 deletions

diff --git a/src/pbkdf/info.txt b/src/pbkdf/info.txt
index 861b6f760..d991577f7 100644
--- a/src/pbkdf/info.txt
+++ b/src/pbkdf/info.txt
@@ -1,3 +1,3 @@
 <requires>
-sym_algo
+algo_base
 </requires>
diff --git a/src/pbkdf/pbkdf.h b/src/pbkdf/pbkdf.h
index 91883f9e2..e8e841562 100644
--- a/src/pbkdf/pbkdf.h
+++ b/src/pbkdf/pbkdf.h
@@ -8,6 +8,7 @@
 #ifndef BOTAN_PBKDF_H__
 #define BOTAN_PBKDF_H__
 
+#include <botan/algo_base.h>
 #include <botan/symkey.h>
 
 namespace Botan {
@@ -17,7 +18,7 @@ namespace Botan {
 * implementations. Converts a password into a key using a salt
 * and iterated hashing to make brute force attacks harder.
 */
-class BOTAN_DLL PBKDF
+class BOTAN_DLL PBKDF : public Algorithm
    {
    public:
 
@@ -26,16 +27,7 @@ class BOTAN_DLL PBKDF
       */
       virtual PBKDF* clone() const = 0;
 
-      /**
-      * Get the algorithm name.
-      * @return name of this PBKDF algorithm
-      */
-      virtual std::string name() const = 0;
-
-      /**
-      * Clear this objects internal values.
-      */
-      virtual void clear() {}
+      void clear() {}
 
       /**
       * Derive a key from a passphrase