denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add features support to eap-sim-pcsc plugin

Browse Source
This commit is contained in:
Martin Willi
2011-10-14 10:05:49 +02:00
parent 5f17a09323
commit 9099e4fd3c
2 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/eap_sim_pcsc/Makefile.am
+4 -3
View File
@@ -4,15 +4,16 @@ INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
AM_CFLAGS = -rdynamic ${pcsclite_CFLAGS}
libstrongswan_eap_sim_pcsc_la_LDFLAGS = -module -avoid-version
libstrongswan_eap_sim_pcsc_la_LIBADD = ${pcsclite_LIBS}
if MONOLITHIC
noinst_LTLIBRARIES = libstrongswan-eap-sim-pcsc.la
else
plugin_LTLIBRARIES = libstrongswan-eap-sim-pcsc.la
libstrongswan_eap_sim_pcsc_la_LIBADD += $(top_builddir)/src/libsimaka/libsimaka.la
endif
libstrongswan_eap_sim_pcsc_la_SOURCES = \
eap_sim_pcsc_plugin.h eap_sim_pcsc_plugin.c \
eap_sim_pcsc_card.h eap_sim_pcsc_card.c
libstrongswan_eap_sim_pcsc_la_LDFLAGS = -module -avoid-version
libstrongswan_eap_sim_pcsc_la_LIBADD = ${pcsclite_LIBS}
src/libcharon/plugins/eap_sim_pcsc/eap_sim_pcsc_plugin.c
+21 -14
View File
@@ -41,16 +41,29 @@ METHOD(plugin_t, get_name, char*,
return "eap-sim-pcsc";
}
/**
* Callback providing our card to register
*/
static simaka_card_t* get_card(private_eap_sim_pcsc_plugin_t *this)
{
return &this->card->card;
}
METHOD(plugin_t, get_features, int,
private_eap_sim_pcsc_plugin_t *this, plugin_feature_t *features[])
{
static plugin_feature_t f[] = {
PLUGIN_CALLBACK(simaka_manager_register, get_card),
PLUGIN_PROVIDE(CUSTOM, "sim-card"),
PLUGIN_DEPENDS(CUSTOM, "sim-manager"),
};
*features = f;
return countof(f);
}
METHOD(plugin_t, destroy, void,
private_eap_sim_pcsc_plugin_t *this)
{
simaka_manager_t *mgr;
mgr = lib->get(lib, "sim-manager");
if (mgr)
{
mgr->remove_card(mgr, &this->card->card);
}
this->card->destroy(this->card);
free(this);
}
@@ -61,24 +74,18 @@ METHOD(plugin_t, destroy, void,
plugin_t *eap_sim_pcsc_plugin_create()
{
private_eap_sim_pcsc_plugin_t *this;
simaka_manager_t *mgr;
INIT(this,
.public = {
.plugin = {
.get_name = _get_name,
.reload = (void*)return_false,
.get_features = _get_features,
.destroy = _destroy,
},
},
.card = eap_sim_pcsc_card_create(),
);
mgr = lib->get(lib, "sim-manager");
if (mgr)
{
mgr->add_card(mgr, &this->card->card);
}
return &this->public.plugin;
}