diff options
Diffstat (limited to 'src/libstrongswan/plugins/random/random_plugin.c')
| -rw-r--r-- | src/libstrongswan/plugins/random/random_plugin.c | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/src/libstrongswan/plugins/random/random_plugin.c b/src/libstrongswan/plugins/random/random_plugin.c index f70998334..00202a5a6 100644 --- a/src/libstrongswan/plugins/random/random_plugin.c +++ b/src/libstrongswan/plugins/random/random_plugin.c @@ -18,11 +18,6 @@ #include <library.h> #include "random_rng.h" -<<<<<<< HEAD -======= -static const char *plugin_name = "random"; - ->>>>>>> upstream/4.5.1 typedef struct private_random_plugin_t private_random_plugin_t; /** @@ -36,15 +31,14 @@ struct private_random_plugin_t { random_plugin_t public; }; -<<<<<<< HEAD -/** - * Implementation of random_plugin_t.gmptroy - */ -static void destroy(private_random_plugin_t *this) -======= +METHOD(plugin_t, get_name, char*, + private_random_plugin_t *this) +{ + return "random"; +} + METHOD(plugin_t, destroy, void, private_random_plugin_t *this) ->>>>>>> upstream/4.5.1 { lib->crypto->remove_rng(lib->crypto, (rng_constructor_t)random_rng_create); @@ -56,29 +50,21 @@ METHOD(plugin_t, destroy, void, */ plugin_t *random_plugin_create() { -<<<<<<< HEAD - private_random_plugin_t *this = malloc_thing(private_random_plugin_t); - - this->public.plugin.destroy = (void(*)(plugin_t*))destroy; - - lib->crypto->add_rng(lib->crypto, RNG_STRONG, - (rng_constructor_t)random_rng_create); - lib->crypto->add_rng(lib->crypto, RNG_TRUE, -======= private_random_plugin_t *this; INIT(this, .public = { .plugin = { + .get_name = _get_name, + .reload = (void*)return_false, .destroy = _destroy, }, }, ); - lib->crypto->add_rng(lib->crypto, RNG_STRONG, plugin_name, + lib->crypto->add_rng(lib->crypto, RNG_STRONG, get_name(this), (rng_constructor_t)random_rng_create); - lib->crypto->add_rng(lib->crypto, RNG_TRUE, plugin_name, ->>>>>>> upstream/4.5.1 + lib->crypto->add_rng(lib->crypto, RNG_TRUE, get_name(this), (rng_constructor_t)random_rng_create); return &this->public.plugin; |