sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-11-30 00:00:23 -05:00
Code Issues Projects Releases Wiki Activity

Migrated pgp_plugin_t to INIT/METHOD macros

Browse Source
This commit is contained in:
Andreas Steffen 2010-12-04 09:30:25 +01:00
parent 9a76f6ded2
commit b5eeebe657
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libstrongswan/plugins/pgp/pgp_plugin.c
View File

@ -33,10 +33,8 @@ struct private_pgp_plugin_t {
pgp_plugin_t public;
};
/**
* Implementation of pgp_plugin_t.pgptroy
*/
static void destroy(private_pgp_plugin_t *this)
METHOD(plugin_t, destroy, void,
private_pgp_plugin_t *this)
{
lib->creds->remove_builder(lib->creds,
(builder_function_t)pgp_public_key_load);
@ -56,10 +54,15 @@ static void destroy(private_pgp_plugin_t *this)
*/
plugin_t *pgp_plugin_create()
{
private_pgp_plugin_t *this = malloc_thing(private_pgp_plugin_t);
this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
private_pgp_plugin_t *this;
INIT(this,
.public = {
.plugin = {
.destroy = _destroy,
},
},
);
lib->creds->add_builder(lib->creds, CRED_PUBLIC_KEY, KEY_ANY, FALSE,
(builder_function_t)pgp_public_key_load);
lib->creds->add_builder(lib->creds, CRED_PUBLIC_KEY, KEY_RSA, FALSE,
@ -68,10 +71,8 @@ plugin_t *pgp_plugin_create()
(builder_function_t)pgp_private_key_load);
lib->creds->add_builder(lib->creds, CRED_PRIVATE_KEY, KEY_RSA, FALSE,
(builder_function_t)pgp_private_key_load);
lib->creds->add_builder(lib->creds, CRED_CERTIFICATE, CERT_GPG, FALSE,
(builder_function_t)pgp_cert_load);
lib->encoding->add_encoder(lib->encoding, pgp_encoder_encode);
return &this->public.plugin;