summaryrefslogtreecommitdiff
path: root/src/libstrongswan/plugins/pem/pem_plugin.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/libstrongswan/plugins/pem/pem_plugin.c')
-rw-r--r--src/libstrongswan/plugins/pem/pem_plugin.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/src/libstrongswan/plugins/pem/pem_plugin.c b/src/libstrongswan/plugins/pem/pem_plugin.c
index 83efb155b..0e6a4788c 100644
--- a/src/libstrongswan/plugins/pem/pem_plugin.c
+++ b/src/libstrongswan/plugins/pem/pem_plugin.c
@@ -33,10 +33,15 @@ struct private_pem_plugin_t {
pem_plugin_t public;
};
+<<<<<<< HEAD
/**
* Implementation of pem_plugin_t.pemtroy
*/
static void destroy(private_pem_plugin_t *this)
+=======
+METHOD(plugin_t, destroy, void,
+ private_pem_plugin_t *this)
+>>>>>>> upstream/4.5.1
{
lib->creds->remove_builder(lib->creds,
(builder_function_t)pem_private_key_load);
@@ -52,9 +57,21 @@ static void destroy(private_pem_plugin_t *this)
*/
plugin_t *pem_plugin_create()
{
+<<<<<<< HEAD
private_pem_plugin_t *this = malloc_thing(private_pem_plugin_t);
this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
+=======
+ private_pem_plugin_t *this;
+
+ INIT(this,
+ .public = {
+ .plugin = {
+ .destroy = _destroy,
+ },
+ },
+ );
+>>>>>>> upstream/4.5.1
/* register private key PEM decoding builders */
lib->creds->add_builder(lib->creds, CRED_PRIVATE_KEY, KEY_ANY, FALSE,