Add features support to pubkey plugin

diff --git a/src/libstrongswan/plugins/pubkey/pubkey_plugin.c b/src/libstrongswan/plugins/pubkey/pubkey_plugin.c
index ae6607e5ade9ebdc72df0d595bc0f390e5887e23..92bfc2e63bc082201a6c5e9cefefa4db4fa3cea6 100644 (file)
--- a/src/libstrongswan/plugins/pubkey/pubkey_plugin.c
+++ b/src/libstrongswan/plugins/pubkey/pubkey_plugin.c
@@ -37,11 +37,19 @@ METHOD(plugin_t, get_name, char*,
        return "pubkey";
 }
 
+METHOD(plugin_t, get_features, int,
+       private_pubkey_plugin_t *this, plugin_feature_t *features[])
+{
+       static plugin_feature_t f[] = {
+               PLUGIN_REGISTER(CERT_ENCODE, pubkey_cert_wrap, FALSE),
+                       PLUGIN_PROVIDE(CERT_ENCODE, CERT_TRUSTED_PUBKEY),
+       };
+       *features = f;
+       return countof(f);
+}
 METHOD(plugin_t, destroy, void,
        private_pubkey_plugin_t *this)
 {
-       lib->creds->remove_builder(lib->creds,
-                                                       (builder_function_t)pubkey_cert_wrap);
        free(this);
 }
 
@@ -56,15 +64,12 @@ plugin_t *pubkey_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_CERTIFICATE, CERT_TRUSTED_PUBKEY, FALSE,
-                                                       (builder_function_t)pubkey_cert_wrap);
-
        return &this->public.plugin;
 }