diff options
Diffstat (limited to 'src/libstrongswan/plugins/md4/md4_plugin.c')
| -rw-r--r-- | src/libstrongswan/plugins/md4/md4_plugin.c | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/src/libstrongswan/plugins/md4/md4_plugin.c b/src/libstrongswan/plugins/md4/md4_plugin.c index cdb0fe914..371bba280 100644 --- a/src/libstrongswan/plugins/md4/md4_plugin.c +++ b/src/libstrongswan/plugins/md4/md4_plugin.c @@ -18,11 +18,6 @@ #include <library.h> #include "md4_hasher.h" -<<<<<<< HEAD -======= -static const char *plugin_name = "md4"; - ->>>>>>> upstream/4.5.1 typedef struct private_md4_plugin_t private_md4_plugin_t; /** @@ -36,15 +31,14 @@ struct private_md4_plugin_t { md4_plugin_t public; }; -<<<<<<< HEAD -/** - * Implementation of md4_plugin_t.destroy - */ -static void destroy(private_md4_plugin_t *this) -======= +METHOD(plugin_t, get_name, char*, + private_md4_plugin_t *this) +{ + return "md4"; +} + METHOD(plugin_t, destroy, void, private_md4_plugin_t *this) ->>>>>>> upstream/4.5.1 { lib->crypto->remove_hasher(lib->crypto, (hasher_constructor_t)md4_hasher_create); @@ -56,25 +50,19 @@ METHOD(plugin_t, destroy, void, */ plugin_t *md4_plugin_create() { -<<<<<<< HEAD - private_md4_plugin_t *this = malloc_thing(private_md4_plugin_t); - - this->public.plugin.destroy = (void(*)(plugin_t*))destroy; - - lib->crypto->add_hasher(lib->crypto, HASH_MD4, -======= private_md4_plugin_t *this; INIT(this, .public = { .plugin = { + .get_name = _get_name, + .reload = (void*)return_false, .destroy = _destroy, }, }, ); - lib->crypto->add_hasher(lib->crypto, HASH_MD4, plugin_name, ->>>>>>> upstream/4.5.1 + lib->crypto->add_hasher(lib->crypto, HASH_MD4, get_name(this), (hasher_constructor_t)md4_hasher_create); return &this->public.plugin; |