charon-tkm: Use lib->ns instead of charon->name

diff --git a/src/charon-tkm/src/tkm/tkm.c b/src/charon-tkm/src/tkm/tkm.c
index a39221dc28a11199ac24304ab2f8bd80bc0551d2..61eb6056cabf720bb5d52643b496143411d091e3 100644 (file)
--- a/src/charon-tkm/src/tkm/tkm.c
+++ b/src/charon-tkm/src/tkm/tkm.c
@@ -61,7 +61,7 @@ bool tkm_init()
        ehandler_init();
 
        ikesock = lib->settings->get_str(lib->settings, "%s.ike_socket", IKE_SOCKET,
-                                                                        charon->name);
+                                                                        lib->ns);
        if (ike_init(ikesock) != TKM_OK)
        {
                tkmlib_final();
@@ -70,7 +70,7 @@ bool tkm_init()
        DBG1(DBG_DMN, "connected to TKM via socket '%s'", ikesock);
 
        eessock = lib->settings->get_str(lib->settings, "%s.ees_socket", EES_SOCKET,
-                                                                        charon->name);
+                                                                        lib->ns);
        ees_server_init(eessock);
        DBG1(DBG_DMN, "serving EES requests on socket '%s'", eessock);
 

diff --git a/src/charon-tkm/src/tkm/tkm_diffie_hellman.c b/src/charon-tkm/src/tkm/tkm_diffie_hellman.c
index c30a03f3955234ea90ac25afc44c9c4e03e44628..a34d0b1d4ab1d541f4570f9152e7e00ebe847836 100644 (file)
--- a/src/charon-tkm/src/tkm/tkm_diffie_hellman.c
+++ b/src/charon-tkm/src/tkm/tkm_diffie_hellman.c
@@ -133,7 +133,7 @@ int register_dh_mapping()
 
        enumerator = lib->settings->create_key_value_enumerator(lib->settings,
                                                                                                                        "%s.dh_mapping",
-                                                                                                                       charon->name);
+                                                                                                                       lib->ns);
 
        while (enumerator->enumerate(enumerator, &iana_id_str, &tkm_id_str))
        {

diff --git a/src/charon-tkm/tests/tests.c b/src/charon-tkm/tests/tests.c
index 7a25565475b5ade7fe4e7dab5dac592a836aca6a..e6e3f301da3be8b4b9f2ed76e893b6a01eaa67de 100644 (file)
--- a/src/charon-tkm/tests/tests.c
+++ b/src/charon-tkm/tests/tests.c
@@ -67,9 +67,9 @@ static bool test_runner_init(bool init)
                                                                                  countof(features), TRUE);
 
                lib->settings->set_int(lib->settings, "%s.dh_mapping.%d", 1,
-                                                          charon->name, MODP_3072_BIT);
+                                                          lib->ns, MODP_3072_BIT);
                lib->settings->set_int(lib->settings, "%s.dh_mapping.%d", 2,
-                                                          charon->name, MODP_4096_BIT);
+                                                          lib->ns, MODP_4096_BIT);
                register_dh_mapping();
 
                plugin_loader_add_plugindirs(BUILDDIR "/src/libstrongswan/plugins",