diff options
Diffstat (limited to 'src/libstrongswan/plugins/random/random_plugin.c')
| -rw-r--r-- | src/libstrongswan/plugins/random/random_plugin.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/src/libstrongswan/plugins/random/random_plugin.c b/src/libstrongswan/plugins/random/random_plugin.c index 39678ba71..f70998334 100644 --- a/src/libstrongswan/plugins/random/random_plugin.c +++ b/src/libstrongswan/plugins/random/random_plugin.c @@ -18,6 +18,11 @@ #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; /** @@ -31,10 +36,15 @@ 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, destroy, void, + private_random_plugin_t *this) +>>>>>>> upstream/4.5.1 { lib->crypto->remove_rng(lib->crypto, (rng_constructor_t)random_rng_create); @@ -46,6 +56,7 @@ static void destroy(private_random_plugin_t *this) */ 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; @@ -53,6 +64,21 @@ plugin_t *random_plugin_create() 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 = { + .destroy = _destroy, + }, + }, + ); + + lib->crypto->add_rng(lib->crypto, RNG_STRONG, plugin_name, + (rng_constructor_t)random_rng_create); + lib->crypto->add_rng(lib->crypto, RNG_TRUE, plugin_name, +>>>>>>> upstream/4.5.1 (rng_constructor_t)random_rng_create); return &this->public.plugin; |