Added features support to pgp plugin
authorAndreas Steffen <andreas.steffen@strongswan.org>
Sun, 30 Oct 2011 16:52:13 +0000 (17:52 +0100)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Sun, 30 Oct 2011 16:52:13 +0000 (17:52 +0100)
src/libstrongswan/plugins/pgp/pgp_plugin.c

index 52e9d96..a2cf403 100644 (file)
@@ -39,17 +39,30 @@ METHOD(plugin_t, get_name, char*,
        return "pgp";
 }
 
-METHOD(plugin_t, destroy, void,
-       private_pgp_plugin_t *this)
+METHOD(plugin_t, get_features, int,
+       private_pgp_plugin_t *this, plugin_feature_t *features[])
 {
-       lib->creds->remove_builder(lib->creds,
-                                                       (builder_function_t)pgp_public_key_load);
-       lib->creds->remove_builder(lib->creds,
-                                                       (builder_function_t)pgp_private_key_load);
+       static plugin_feature_t f[] = {
+               PLUGIN_REGISTER(PRIVKEY, pgp_private_key_load, FALSE),
+                       PLUGIN_PROVIDE(PRIVKEY, KEY_ANY),
+               PLUGIN_REGISTER(PRIVKEY, pgp_private_key_load, FALSE),
+                       PLUGIN_PROVIDE(PRIVKEY, KEY_RSA),
 
-       lib->creds->remove_builder(lib->creds,
-                                                       (builder_function_t)pgp_cert_load);
+               PLUGIN_REGISTER(PUBKEY, pgp_public_key_load, FALSE),
+                       PLUGIN_PROVIDE(PUBKEY, KEY_ANY),
+               PLUGIN_REGISTER(PUBKEY, pgp_public_key_load, FALSE),
+                       PLUGIN_PROVIDE(PUBKEY, KEY_RSA),
+
+               PLUGIN_REGISTER(CERT_DECODE, pgp_cert_load, FALSE),
+                       PLUGIN_PROVIDE(CERT_DECODE, CERT_GPG),
+       };
+       *features = f;
+       return countof(f);
+}
 
+METHOD(plugin_t, destroy, void,
+       private_pgp_plugin_t *this)
+{
        lib->encoding->remove_encoder(lib->encoding, pgp_encoder_encode);
 
        free(this);
@@ -66,21 +79,12 @@ plugin_t *pgp_plugin_create()
                .public = {
                        .plugin = {
                                .get_name = _get_name,
-                               .reload = (void*)return_false,
+                               .get_features = _get_features,
                                .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,
-                                                       (builder_function_t)pgp_public_key_load);
-       lib->creds->add_builder(lib->creds, CRED_PRIVATE_KEY, KEY_ANY, FALSE,
-                                                       (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;