diff options
Diffstat (limited to 'src/libstrongswan/plugins/sha2/sha2_plugin.c')
| -rw-r--r-- | src/libstrongswan/plugins/sha2/sha2_plugin.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/src/libstrongswan/plugins/sha2/sha2_plugin.c b/src/libstrongswan/plugins/sha2/sha2_plugin.c index 810d9922a..b47f07b8d 100644 --- a/src/libstrongswan/plugins/sha2/sha2_plugin.c +++ b/src/libstrongswan/plugins/sha2/sha2_plugin.c @@ -18,6 +18,11 @@ #include <library.h> #include "sha2_hasher.h" +<<<<<<< HEAD +======= +static const char *plugin_name = "sha2"; + +>>>>>>> upstream/4.5.1 typedef struct private_sha2_plugin_t private_sha2_plugin_t; /** @@ -31,10 +36,15 @@ struct private_sha2_plugin_t { sha2_plugin_t public; }; +<<<<<<< HEAD /** * Implementation of sha2_plugin_t.destroy */ static void destroy(private_sha2_plugin_t *this) +======= +METHOD(plugin_t, destroy, void, + private_sha2_plugin_t *this) +>>>>>>> upstream/4.5.1 { lib->crypto->remove_hasher(lib->crypto, (hasher_constructor_t)sha2_hasher_create); @@ -46,6 +56,7 @@ static void destroy(private_sha2_plugin_t *this) */ plugin_t *sha2_plugin_create() { +<<<<<<< HEAD private_sha2_plugin_t *this = malloc_thing(private_sha2_plugin_t); this->public.plugin.destroy = (void(*)(plugin_t*))destroy; @@ -57,6 +68,25 @@ plugin_t *sha2_plugin_create() lib->crypto->add_hasher(lib->crypto, HASH_SHA384, (hasher_constructor_t)sha2_hasher_create); lib->crypto->add_hasher(lib->crypto, HASH_SHA512, +======= + private_sha2_plugin_t *this; + + INIT(this, + .public = { + .plugin = { + .destroy = _destroy, + }, + }, + ); + + lib->crypto->add_hasher(lib->crypto, HASH_SHA224, plugin_name, + (hasher_constructor_t)sha2_hasher_create); + lib->crypto->add_hasher(lib->crypto, HASH_SHA256, plugin_name, + (hasher_constructor_t)sha2_hasher_create); + lib->crypto->add_hasher(lib->crypto, HASH_SHA384, plugin_name, + (hasher_constructor_t)sha2_hasher_create); + lib->crypto->add_hasher(lib->crypto, HASH_SHA512, plugin_name, +>>>>>>> upstream/4.5.1 (hasher_constructor_t)sha2_hasher_create); return &this->public.plugin; |