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, 6 insertions, 5 deletions

diff --git a/src/entropy/entropy_src.h b/src/entropy/entropy_src.h
index 97ebe8bd9..d713598d9 100644
--- a/src/entropy/entropy_src.h
+++ b/src/entropy/entropy_src.h
@@ -94,16 +94,17 @@ class BOTAN_DLL Entropy_Accumulator
    };
 
 /**
-* Entropy accumulator that puts the input into a BufferedComputation
+* Entropy accumulator that puts the input into a Buffered_Computation
 */
-class BOTAN_DLL Entropy_Accumulator_BufferedComputation : public Entropy_Accumulator
+class BOTAN_DLL Entropy_Accumulator_BufferedComputation :
+   public Entropy_Accumulator
    {
    public:
       /**
       * @param sink the hash or MAC we are feeding the poll data into
       * @param goal is how many bits we want to collect in this poll
       */
-      Entropy_Accumulator_BufferedComputation(BufferedComputation& sink,
+      Entropy_Accumulator_BufferedComputation(Buffered_Computation& sink,
                                               size_t goal) :
          Entropy_Accumulator(goal), entropy_sink(sink) {}
 
@@ -113,7 +114,7 @@ class BOTAN_DLL Entropy_Accumulator_BufferedComputation : public Entropy_Accumul
          entropy_sink.update(bytes, length);
          }
 
-      BufferedComputation& entropy_sink;
+      Buffered_Computation& entropy_sink;
    };
 
 /**
diff --git a/src/entropy/info.txt b/src/entropy/info.txt
index a048df7d9..d991577f7 100644
--- a/src/entropy/info.txt
+++ b/src/entropy/info.txt
@@ -1,3 +1,3 @@
 <requires>
-buf_comp
+algo_base
 </requires>