aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcharon
diff options
context:
space:
mode:
authorAndreas Steffen <andreas.steffen@strongswan.org>2011-10-14 17:20:33 +0200
committerAndreas Steffen <andreas.steffen@strongswan.org>2011-10-14 17:20:33 +0200
commite0f4f26dede47c22a176e955b79a9333f0d66995 (patch)
tree023ecf1f40e72fa4a3e7294df290681ae6acb521 /src/libcharon
parentaa1ecd7b83b04443b5ff28c5fc93b38217edb0f2 (diff)
downloadstrongswan-e0f4f26dede47c22a176e955b79a9333f0d66995.tar.bz2
strongswan-e0f4f26dede47c22a176e955b79a9333f0d66995.tar.xz
Add features support to eap-ttls plugin
Diffstat (limited to 'src/libcharon')
-rw-r--r--src/libcharon/plugins/eap_ttls/eap_ttls_plugin.c33
1 files changed, 23 insertions, 10 deletions
diff --git a/src/libcharon/plugins/eap_ttls/eap_ttls_plugin.c b/src/libcharon/plugins/eap_ttls/eap_ttls_plugin.c
index cbc3929bb..7ccbc9381 100644
--- a/src/libcharon/plugins/eap_ttls/eap_ttls_plugin.c
+++ b/src/libcharon/plugins/eap_ttls/eap_ttls_plugin.c
@@ -25,13 +25,31 @@ METHOD(plugin_t, get_name, char*,
return "eap-ttls";
}
+METHOD(plugin_t, get_features, int,
+ eap_ttls_plugin_t *this, plugin_feature_t *features[])
+{
+ static plugin_feature_t f[] = {
+ PLUGIN_CALLBACK(eap_method_register, eap_ttls_create_server),
+ PLUGIN_PROVIDE(EAP_SERVER, EAP_TTLS),
+ PLUGIN_DEPENDS(EAP_SERVER, EAP_IDENTITY),
+ PLUGIN_DEPENDS(HASHER, HASH_MD5),
+ PLUGIN_DEPENDS(HASHER, HASH_SHA1),
+ PLUGIN_DEPENDS(RNG, RNG_WEAK),
+ PLUGIN_CALLBACK(eap_method_register, eap_ttls_create_peer),
+ PLUGIN_PROVIDE(EAP_PEER, EAP_TTLS),
+ PLUGIN_DEPENDS(EAP_PEER, EAP_IDENTITY),
+ PLUGIN_DEPENDS(HASHER, HASH_MD5),
+ PLUGIN_DEPENDS(HASHER, HASH_SHA1),
+ PLUGIN_DEPENDS(RNG, RNG_WEAK),
+ PLUGIN_DEPENDS(RNG, RNG_STRONG),
+ };
+ *features = f;
+ return countof(f);
+}
+
METHOD(plugin_t, destroy, void,
eap_ttls_plugin_t *this)
{
- charon->eap->remove_method(charon->eap,
- (eap_constructor_t)eap_ttls_create_server);
- charon->eap->remove_method(charon->eap,
- (eap_constructor_t)eap_ttls_create_peer);
free(this);
}
@@ -45,15 +63,10 @@ plugin_t *eap_ttls_plugin_create()
INIT(this,
.plugin = {
.get_name = _get_name,
- .reload = (void*)return_false,
+ .get_features = _get_features,
.destroy = _destroy,
},
);
- charon->eap->add_method(charon->eap, EAP_TTLS, 0, EAP_SERVER,
- (eap_constructor_t)eap_ttls_create_server);
- charon->eap->add_method(charon->eap, EAP_TTLS, 0, EAP_PEER,
- (eap_constructor_t)eap_ttls_create_peer);
-
return &this->plugin;
}