diff options
Diffstat (limited to 'src/libstrongswan/plugins/pkcs1/pkcs1_plugin.c')
| -rw-r--r-- | src/libstrongswan/plugins/pkcs1/pkcs1_plugin.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/libstrongswan/plugins/pkcs1/pkcs1_plugin.c b/src/libstrongswan/plugins/pkcs1/pkcs1_plugin.c index d3afb5c67..d91de0e7f 100644 --- a/src/libstrongswan/plugins/pkcs1/pkcs1_plugin.c +++ b/src/libstrongswan/plugins/pkcs1/pkcs1_plugin.c @@ -32,10 +32,15 @@ struct private_pkcs1_plugin_t { pkcs1_plugin_t public; }; +<<<<<<< HEAD /** * Implementation of pkcs1_plugin_t.pkcs1troy */ static void destroy(private_pkcs1_plugin_t *this) +======= +METHOD(plugin_t, destroy, void, + private_pkcs1_plugin_t *this) +>>>>>>> upstream/4.5.1 { lib->creds->remove_builder(lib->creds, (builder_function_t)pkcs1_public_key_load); @@ -52,9 +57,21 @@ static void destroy(private_pkcs1_plugin_t *this) */ plugin_t *pkcs1_plugin_create() { +<<<<<<< HEAD private_pkcs1_plugin_t *this = malloc_thing(private_pkcs1_plugin_t); this->public.plugin.destroy = (void(*)(plugin_t*))destroy; +======= + private_pkcs1_plugin_t *this; + + INIT(this, + .public = { + .plugin = { + .destroy = _destroy, + }, + }, + ); +>>>>>>> upstream/4.5.1 lib->creds->add_builder(lib->creds, CRED_PUBLIC_KEY, KEY_ANY, FALSE, (builder_function_t)pkcs1_public_key_load); |