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.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/x509opt.cpp b/src/x509opt.cpp
index 65cc16c19..4c8abf53c 100644
--- a/src/x509opt.cpp
+++ b/src/x509opt.cpp
@@ -79,8 +79,10 @@ void X509_Cert_Options::sanity_check() const
 *************************************************/
 X509_Cert_Options::X509_Cert_Options(const std::string& initial_opts)
    {
-   const u32bit DEFAULT_EXPIRE = Config::get_time("x509/ca/default_expire");
-   const u32bit OFFSET_FROM_NOW = Config::get_time("x509/ca/signing_offset");
+   const u32bit DEFAULT_EXPIRE =
+      global_config().option_as_time("x509/ca/default_expire");
+   const u32bit OFFSET_FROM_NOW =
+      global_config().option_as_time("x509/ca/signing_offset");
 
    is_CA = false;
    path_limit = 0;