Add features support to ctr plugin

diff --git a/src/libstrongswan/plugins/ctr/ctr_plugin.c b/src/libstrongswan/plugins/ctr/ctr_plugin.c
index 6850cacf01ae42456fec65294662a3f631ac576c..c01308a522f2f2056359efe0f132983a9f4f0c4d 100644 (file)
--- a/src/libstrongswan/plugins/ctr/ctr_plugin.c
+++ b/src/libstrongswan/plugins/ctr/ctr_plugin.c
@@ -38,12 +38,31 @@ METHOD(plugin_t, get_name, char*,
        return "ctr";
 }
 
+METHOD(plugin_t, get_features, int,
+       private_ctr_plugin_t *this, plugin_feature_t *features[])
+{
+       static plugin_feature_t f[] = {
+               PLUGIN_REGISTER(CRYPTER, ctr_ipsec_crypter_create),
+                       PLUGIN_PROVIDE(CRYPTER, ENCR_AES_CTR, 16),
+                               PLUGIN_DEPENDS(CRYPTER, ENCR_AES_CBC, 16),
+                       PLUGIN_PROVIDE(CRYPTER, ENCR_AES_CTR, 24),
+                               PLUGIN_DEPENDS(CRYPTER, ENCR_AES_CBC, 24),
+                       PLUGIN_PROVIDE(CRYPTER, ENCR_AES_CTR, 32),
+                               PLUGIN_DEPENDS(CRYPTER, ENCR_AES_CBC, 32),
+                       PLUGIN_PROVIDE(CRYPTER, ENCR_CAMELLIA_CTR, 16),
+                               PLUGIN_DEPENDS(CRYPTER, ENCR_CAMELLIA_CBC, 16),
+                       PLUGIN_PROVIDE(CRYPTER, ENCR_CAMELLIA_CTR, 24),
+                               PLUGIN_DEPENDS(CRYPTER, ENCR_CAMELLIA_CBC, 24),
+                       PLUGIN_PROVIDE(CRYPTER, ENCR_CAMELLIA_CTR, 32),
+                               PLUGIN_DEPENDS(CRYPTER, ENCR_CAMELLIA_CBC, 32),
+       };
+       *features = f;
+       return countof(f);
+}
+
 METHOD(plugin_t, destroy, void,
        private_ctr_plugin_t *this)
 {
-       lib->crypto->remove_crypter(lib->crypto,
-                                       (crypter_constructor_t)ctr_ipsec_crypter_create);
-
        free(this);
 }
 
@@ -53,31 +72,16 @@ METHOD(plugin_t, destroy, void,
 plugin_t *ctr_plugin_create()
 {
        private_ctr_plugin_t *this;
-       crypter_t *crypter;
 
        INIT(this,
                .public = {
                        .plugin = {
                                .get_name = _get_name,
-                               .reload = (void*)return_false,
+                               .get_features = _get_features,
                                .destroy = _destroy,
                        },
                },
        );
 
-       crypter = lib->crypto->create_crypter(lib->crypto, ENCR_AES_CBC, 16);
-       if (crypter)
-       {
-               crypter->destroy(crypter);
-               lib->crypto->add_crypter(lib->crypto, ENCR_AES_CTR, get_name(this),
-                                               (crypter_constructor_t)ctr_ipsec_crypter_create);
-       }
-       crypter = lib->crypto->create_crypter(lib->crypto, ENCR_CAMELLIA_CBC, 16);
-       if (crypter)
-       {
-               crypter->destroy(crypter);
-               lib->crypto->add_crypter(lib->crypto, ENCR_CAMELLIA_CTR, get_name(this),
-                                               (crypter_constructor_t)ctr_ipsec_crypter_create);
-       }
        return &this->public.plugin;
 }