denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tobias Brunner
2014-02-12 14:34:32 +01:00
parent d223fe807a
commit 9222bfc695
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon-tkm/src/tkm/tkm.c
+2 -2
View File
@@ -61,7 +61,7 @@ bool tkm_init()
ehandler_init(); ehandler_init();
ikesock = lib->settings->get_str(lib->settings, "%s.ike_socket", IKE_SOCKET, ikesock = lib->settings->get_str(lib->settings, "%s.ike_socket", IKE_SOCKET,
charon->name); lib->ns);
if (ike_init(ikesock) != TKM_OK) if (ike_init(ikesock) != TKM_OK)
{ {
tkmlib_final(); tkmlib_final();
@@ -70,7 +70,7 @@ bool tkm_init()
DBG1(DBG_DMN, "connected to TKM via socket '%s'", ikesock); DBG1(DBG_DMN, "connected to TKM via socket '%s'", ikesock);
eessock = lib->settings->get_str(lib->settings, "%s.ees_socket", EES_SOCKET, eessock = lib->settings->get_str(lib->settings, "%s.ees_socket", EES_SOCKET,
charon->name); lib->ns);
ees_server_init(eessock); ees_server_init(eessock);
DBG1(DBG_DMN, "serving EES requests on socket '%s'", eessock); DBG1(DBG_DMN, "serving EES requests on socket '%s'", eessock);
src/charon-tkm/src/tkm/tkm_diffie_hellman.c
+1 -1
View File
@@ -133,7 +133,7 @@ int register_dh_mapping()
enumerator = lib->settings->create_key_value_enumerator(lib->settings, enumerator = lib->settings->create_key_value_enumerator(lib->settings,
"%s.dh_mapping", "%s.dh_mapping",
charon->name); lib->ns);
while (enumerator->enumerate(enumerator, &iana_id_str, &tkm_id_str)) while (enumerator->enumerate(enumerator, &iana_id_str, &tkm_id_str))
{ {
src/charon-tkm/tests/tests.c
+2 -2
View File
@@ -67,9 +67,9 @@ static bool test_runner_init(bool init)
countof(features), TRUE); countof(features), TRUE);
lib->settings->set_int(lib->settings, "%s.dh_mapping.%d", 1, 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, lib->settings->set_int(lib->settings, "%s.dh_mapping.%d", 2,
charon->name, MODP_4096_BIT); lib->ns, MODP_4096_BIT);
register_dh_mapping(); register_dh_mapping();
plugin_loader_add_plugindirs(BUILDDIR "/src/libstrongswan/plugins", plugin_loader_add_plugindirs(BUILDDIR "/src/libstrongswan/plugins",