New structure for entropy sources + RNGs. The entropy sources are owned by

Randpool, it will query them as needed (or if asked to do so). New function
make_rng() that creates an RNG (X9.31 backed by a Randpool) and seeds it.
Remove the entropy source related code from the Modules/Builtin_Modules
classes.

1 files changed, 1 insertions, 97 deletions

diff --git a/src/modules.cpp b/src/modules.cpp
index 089281e61..a5016aa8c 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -1,6 +1,6 @@
 /*************************************************
 * Module Factory Source File                     *
-* (C) 1999-2007 Jack Lloyd                       *
+* (C) 1999-2008 Jack Lloyd                       *
 *************************************************/
 
 #include <botan/modules.h>
@@ -21,16 +21,6 @@
   #include <botan/mmap_mem.h>
 #endif
 
-#if defined(BOTAN_EXT_TIMER_HARDWARE)
-  #include <botan/tm_hard.h>
-#elif defined(BOTAN_EXT_TIMER_POSIX)
-  #include <botan/tm_posix.h>
-#elif defined(BOTAN_EXT_TIMER_UNIX)
-  #include <botan/tm_unix.h>
-#elif defined(BOTAN_EXT_TIMER_WIN32)
-  #include <botan/tm_win32.h>
-#endif
-
 #if defined(BOTAN_EXT_ENGINE_GNU_MP)
   #include <botan/eng_gmp.h>
 #endif
@@ -39,34 +29,6 @@
   #include <botan/eng_ossl.h>
 #endif
 
-#if defined(BOTAN_EXT_ENTROPY_SRC_DEVICE)
-  #include <botan/es_dev.h>
-#endif
-
-#if defined(BOTAN_EXT_ENTROPY_SRC_EGD)
-  #include <botan/es_egd.h>
-#endif
-
-#if defined(BOTAN_EXT_ENTROPY_SRC_UNIX)
-  #include <botan/es_unix.h>
-#endif
-
-#if defined(BOTAN_EXT_ENTROPY_SRC_BEOS)
-  #include <botan/es_beos.h>
-#endif
-
-#if defined(BOTAN_EXT_ENTROPY_SRC_CAPI)
-  #include <botan/es_capi.h>
-#endif
-
-#if defined(BOTAN_EXT_ENTROPY_SRC_WIN32)
-  #include <botan/es_win32.h>
-#endif
-
-#if defined(BOTAN_EXT_ENTROPY_SRC_FTW)
-  #include <botan/es_ftw.h>
-#endif
-
 namespace Botan {
 
 /*************************************************
@@ -120,64 +82,6 @@ std::string Builtin_Modules::default_allocator() const
    }
 
 /*************************************************
-* Register any usable entropy sources            *
-*************************************************/
-std::vector<EntropySource*> Builtin_Modules::entropy_sources() const
-   {
-   std::vector<EntropySource*> sources;
-
-#if defined(BOTAN_EXT_TIMER_HARDWARE)
-   sources.push_back(new Hardware_Timer);
-#elif defined(BOTAN_EXT_TIMER_POSIX)
-   sources.push_back(new POSIX_Timer);
-#elif defined(BOTAN_EXT_TIMER_UNIX)
-   sources.push_back(new Unix_Timer);
-#elif defined(BOTAN_EXT_TIMER_WIN32)
-   sources.push_back(new Win32_Timer);
-#else
-   sources.push_back(new Timer);
-#endif
-
-#if defined(BOTAN_EXT_ENTROPY_SRC_EGD)
-   sources.push_back(
-      new EGD_EntropySource(split_on("/var/run/egd-pool:/dev/egd-pool", ':'))
-      );
-#endif
-
-#if defined(BOTAN_EXT_ENTROPY_SRC_DEVICE)
-   sources.push_back(
-      new Device_EntropySource(
-         split_on("/dev/random:/dev/srandom:/dev/urandom", ':')
-         )
-      );
-#endif
-
-#if defined(BOTAN_EXT_ENTROPY_SRC_CAPI)
-   sources.push_back(new Win32_CAPI_EntropySource);
-#endif
-
-#if defined(BOTAN_EXT_ENTROPY_SRC_WIN32)
-   sources.push_back(new Win32_EntropySource);
-#endif
-
-#if defined(BOTAN_EXT_ENTROPY_SRC_UNIX)
-   sources.push_back(
-      new Unix_EntropySource(split_on("/bin:/sbin:/usr/bin:/usr/sbin", ':'))
-      );
-#endif
-
-#if defined(BOTAN_EXT_ENTROPY_SRC_BEOS)
-   sources.push_back(new BeOS_EntropySource);
-#endif
-
-#if defined(BOTAN_EXT_ENTROPY_SRC_FTW)
-   sources.push_back(new FTW_EntropySource("/proc"));
-#endif
-
-   return sources;
-   }
-
-/*************************************************
 * Find any usable engines                        *
 *************************************************/
 std::vector<Engine*> Builtin_Modules::engines() const