Don't manually register kernel_netlink_net

Load complete kernel_netlink plugin instead. Registering the TKM
specific plugins first still ensures that the correct ipsec plugin
is used.

Lazy initialize the RNG_WEAK plugin to avoid the unsatisfiable
soft dependency on startup.
This commit is contained in:
Reto Buerki
2013-03-19 15:23:50 +01:00
committed by Tobias Brunner
parent 32b2ea9edb
commit ae6f4ee39f
4 changed files with 11 additions and 16 deletions
-4
View File
@@ -17,7 +17,6 @@
#include <library.h>
#include <hydra.h>
#include <daemon.h>
#include <plugins/kernel_netlink/kernel_netlink_net.h>
#include "tkm.h"
#include "tkm_nonceg.h"
@@ -44,9 +43,6 @@ int main(void)
PLUGIN_PROVIDE(DH, MODP_4096_BIT),
PLUGIN_CALLBACK(kernel_ipsec_register, tkm_kernel_ipsec_create),
PLUGIN_PROVIDE(CUSTOM, "kernel-ipsec"),
PLUGIN_DEPENDS(RNG, RNG_WEAK),
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);