Migrated pkcs1_plugin_t to INIT/METHOD macros

diff --git a/src/libstrongswan/plugins/pkcs1/pkcs1_plugin.c b/src/libstrongswan/plugins/pkcs1/pkcs1_plugin.c
index d3afb5c677141b6526b646ab2428a87ebc2ce40b..33732f8a4d0cac8b931515ca0b6921277fd48362 100644 (file)
--- a/src/libstrongswan/plugins/pkcs1/pkcs1_plugin.c
+++ b/src/libstrongswan/plugins/pkcs1/pkcs1_plugin.c
@@ -32,10 +32,8 @@ struct private_pkcs1_plugin_t {
        pkcs1_plugin_t public;
 };
 
-/**
- * Implementation of pkcs1_plugin_t.pkcs1troy
- */
-static void destroy(private_pkcs1_plugin_t *this)
+METHOD(plugin_t, destroy, void,
+       private_pkcs1_plugin_t *this)
 {
        lib->creds->remove_builder(lib->creds,
                                                        (builder_function_t)pkcs1_public_key_load);
@@ -52,9 +50,15 @@ static void destroy(private_pkcs1_plugin_t *this)
  */
 plugin_t *pkcs1_plugin_create()
 {
-       private_pkcs1_plugin_t *this = malloc_thing(private_pkcs1_plugin_t);
+       private_pkcs1_plugin_t *this;
 
-       this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
+       INIT(this,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
+               },
+       );
 
        lib->creds->add_builder(lib->creds, CRED_PUBLIC_KEY, KEY_ANY, FALSE,
                                                        (builder_function_t)pkcs1_public_key_load);