diff options
| author | lloyd <[email protected]> | 2008-04-10 05:50:57 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2008-04-10 05:50:57 +0000 |
| commit | 59e71322cad61ff2f09664fc3e59b5446af4566a (patch) | |
| tree | d6bf11f3541d891228f755eeb0a2fef1904852eb /src/modules.cpp | |
| parent | a5cbd8f304d646352789686a659c6923e320f22d (diff) | |
Remove severa global configuration variables related to entropy gathering,
instead passing those values as arguments.
Diffstat (limited to 'src/modules.cpp')
| -rw-r--r-- | src/modules.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/modules.cpp b/src/modules.cpp index 5dad0d144..dc7dc917f 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -8,6 +8,7 @@ #include <botan/def_char.h> #include <botan/eng_def.h> #include <botan/timers.h> +#include <botan/parsing.h> #if defined(BOTAN_EXT_MUTEX_PTHREAD) #include <botan/mux_pthr.h> @@ -157,11 +158,12 @@ std::vector<EntropySource*> Builtin_Modules::entropy_sources() const #endif #if defined(BOTAN_EXT_ENTROPY_SRC_EGD) - sources.push_back(new EGD_EntropySource); + 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); + sources.push_back( + new Device_EntropySource(split_on("/dev/random:/dev/srandom:/dev/urandom", ':'))); #endif #if defined(BOTAN_EXT_ENTROPY_SRC_CAPI) @@ -173,7 +175,7 @@ std::vector<EntropySource*> Builtin_Modules::entropy_sources() const #endif #if defined(BOTAN_EXT_ENTROPY_SRC_UNIX) - sources.push_back(new Unix_EntropySource); + sources.push_back(new Unix_EntropySource(split_on("/bin:/sbin:/usr/bin:/usr/sbin", ':'))); #endif #if defined(BOTAN_EXT_ENTROPY_SRC_BEOS) |