charon-tkm: Register kernel_netlink_net

Explicitly register kernel netlink net implementation and avoid loading
the whole kernel-netlink plugin since the kernel netlink ipsec part is
unwanted.

diff --git a/src/charon-tkm/Makefile.am b/src/charon-tkm/Makefile.am
index 1b5dfdf2b145da4ecaba0ee4ec78617808bbe23b..6c7359323f689e1df02348fdfa0061026cf79965 100644 (file)
--- a/src/charon-tkm/Makefile.am
+++ b/src/charon-tkm/Makefile.am
@@ -25,7 +25,6 @@ PLUGINS = \
        aes \
        constraints \
        hmac \
-       kernel-netlink \
        pem \
        pkcs1 \
        pkcs8 \

diff --git a/src/charon-tkm/src/charon-tkm.c b/src/charon-tkm/src/charon-tkm.c
index 0782bda13da25d266d3c32e76d5ad59519ed5ff5..1d21e7dafd0d5b21d2713022d3e94f9057d0564c 100644 (file)
--- a/src/charon-tkm/src/charon-tkm.c
+++ b/src/charon-tkm/src/charon-tkm.c
@@ -27,6 +27,7 @@
 
 #include <hydra.h>
 #include <daemon.h>
+#include <plugins/kernel_netlink/kernel_netlink_net.h>
 
 #include <library.h>
 #include <utils/backtrace.h>
@@ -287,6 +288,9 @@ int main(int argc, char *argv[])
                        PLUGIN_PROVIDE(DH, MODP_4096_BIT),
                PLUGIN_CALLBACK(kernel_ipsec_register, tkm_kernel_ipsec_create),
                        PLUGIN_PROVIDE(CUSTOM, "kernel-ipsec"),
+               PLUGIN_CALLBACK(kernel_net_register, kernel_netlink_net_create),
+                       PLUGIN_PROVIDE(CUSTOM, "kernel-net"),
+
        };
        lib->plugins->add_static_features(lib->plugins, "tkm-backend", features,
                        countof(features), TRUE);

diff --git a/src/charon-tkm/tests/keymat_tests.c b/src/charon-tkm/tests/keymat_tests.c
index 0fde2fb6e27754e30843812fe538b37c3a341266..0d74ad55cfcfbe86607262c971d815724c494fb2 100644 (file)
--- a/src/charon-tkm/tests/keymat_tests.c
+++ b/src/charon-tkm/tests/keymat_tests.c
@@ -19,12 +19,14 @@
 #include <hydra.h>
 #include <config/proposal.h>
 #include <encoding/payloads/ike_header.h>
+#include <plugins/kernel_netlink/kernel_netlink_net.h>
 #include <tkm/client.h>
 
 #include "tkm.h"
 #include "tkm_nonceg.h"
 #include "tkm_diffie_hellman.h"
 #include "tkm_keymat.h"
+#include "tkm_kernel_ipsec.h"
 
 START_TEST(test_derive_ike_keys)
 {
@@ -39,6 +41,10 @@ START_TEST(test_derive_ike_keys)
                PLUGIN_REGISTER(DH, tkm_diffie_hellman_create),
                        PLUGIN_PROVIDE(DH, MODP_3072_BIT),
                        PLUGIN_PROVIDE(DH, MODP_4096_BIT),
+               PLUGIN_CALLBACK(kernel_ipsec_register, tkm_kernel_ipsec_create),
+                       PLUGIN_PROVIDE(CUSTOM, "kernel-ipsec"),
+               PLUGIN_CALLBACK(kernel_net_register, kernel_netlink_net_create),
+                       PLUGIN_PROVIDE(CUSTOM, "kernel-net"),
        };
        lib->plugins->add_static_features(lib->plugins, "tkm-tests", features,
                        countof(features), TRUE);