Move EntropySource base class to new entropy_src.h (which allows the implementations

to decouple from knowing about RandomNumberGenerator).

2 files changed, 2 insertions, 19 deletions

diff --git a/src/rng/rng.cpp b/src/rng/rng.cpp
index 01e909610..fe3c4e10c 100644
--- a/src/rng/rng.cpp
+++ b/src/rng/rng.cpp
@@ -12,14 +12,6 @@
 namespace Botan {
 
 /*************************************************
-* Default fast poll for EntropySources           *
-*************************************************/
-u32bit EntropySource::fast_poll(byte buf[], u32bit len)
-   {
-   return this->slow_poll(buf, len);
-   }
-
-/*************************************************
 * Get a single random byte                       *
 *************************************************/
 byte RandomNumberGenerator::next_byte()
diff --git a/src/rng/rng.h b/src/rng/rng.h
index 20f2e47b1..fb92bb3c5 100644
--- a/src/rng/rng.h
+++ b/src/rng/rng.h
@@ -6,21 +6,12 @@
 #ifndef BOTAN_RANDOM_NUMBER_GENERATOR_H__
 #define BOTAN_RANDOM_NUMBER_GENERATOR_H__
 
+#include <botan/entropy_src.h>
 #include <botan/exceptn.h>
+#include <string>
 
 namespace Botan {
 
-/*************************************************
-* Entropy Source                                 *
-*************************************************/
-class BOTAN_DLL EntropySource
-   {
-   public:
-      virtual u32bit slow_poll(byte[], u32bit) = 0;
-      virtual u32bit fast_poll(byte[], u32bit);
-      virtual ~EntropySource() {}
-   };
-
 /**
 * This class represents a random number (RNG) generator object.
 */