diff options
| author | Martin Willi <martin@revosec.ch> | 2011-09-21 11:39:17 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2011-10-14 10:05:46 +0200 |
| commit | d29d63c2cb0bfffb8c427da618d2b304a01b6a88 (patch) | |
| tree | dabefdf153913512266f0de09873cd1216123138 | |
| parent | 5cb10a22a3f827fd749db53e7c5188fe3dcb00a5 (diff) | |
| download | strongswan-d29d63c2cb0bfffb8c427da618d2b304a01b6a88.tar.bz2 strongswan-d29d63c2cb0bfffb8c427da618d2b304a01b6a88.tar.xz | |
Add features support to ctr plugin
| -rw-r--r-- | src/libstrongswan/plugins/ctr/ctr_plugin.c | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/src/libstrongswan/plugins/ctr/ctr_plugin.c b/src/libstrongswan/plugins/ctr/ctr_plugin.c index 6850cacf0..c01308a52 100644 --- 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; } |