diff options
| author | lloyd <[email protected]> | 2006-07-01 21:09:54 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2006-07-01 21:09:54 +0000 |
| commit | 6d3a4de1efcb6b04a1ab87037d487f979d7ca445 (patch) | |
| tree | 02342b193a3808d2010b441480f65aa45a23dc92 /modules | |
| parent | 3d1d14cf405111e30643cf4c7674d441cc07a2e0 (diff) | |
Access the global configuration through an object reference instead
of stand-alone functions. Store the configuration in a distinct
object, rather than just a map inside the library state.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/es_egd/es_egd.cpp | 3 | ||||
| -rw-r--r-- | modules/es_unix/es_unix.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/modules/es_egd/es_egd.cpp b/modules/es_egd/es_egd.cpp index 3f6f2b29b..adc71b9c0 100644 --- a/modules/es_egd/es_egd.cpp +++ b/modules/es_egd/es_egd.cpp @@ -26,7 +26,8 @@ namespace Botan { EGD_EntropySource::EGD_EntropySource(const std::string& egd_paths) { std::vector<std::string> path_list = split_on(egd_paths, ':'); - std::vector<std::string> defaults = Config::get_list("rng/egd_path"); + std::vector<std::string> defaults = + global_config().option_as_list("rng/egd_path"); for(u32bit j = 0; j != path_list.size(); j++) paths.push_back(path_list[j]); diff --git a/modules/es_unix/es_unix.cpp b/modules/es_unix/es_unix.cpp index f3dc835f9..c956e8fa5 100644 --- a/modules/es_unix/es_unix.cpp +++ b/modules/es_unix/es_unix.cpp @@ -80,7 +80,7 @@ void Unix_EntropySource::gather(u32bit target_amount) u32bit Unix_EntropySource::gather_from(const Unix_Program& prog) { const std::string BASE_PATH = "/bin:/sbin:/usr/bin:/usr/sbin"; - const std::string EXTRA_PATH = Config::get_string("rng/unix_path"); + const std::string EXTRA_PATH = global_config().option("rng/unix_path"); std::string PATH = BASE_PATH; if(EXTRA_PATH != "") |