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

Migrated eap_sim plugin to INIT/METHOD macros

Browse Source
This commit is contained in:
Andreas Steffen
2011-04-05 16:12:38 +02:00
parent ab5e087309
commit 125fadb3e0
2 changed files with 54 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/eap_sim/eap_sim_peer.c
+27 -38
View File
@@ -516,11 +516,8 @@ static status_t process_notification(private_eap_sim_peer_t *this,
return NEED_MORE;
}
/**
* Implementation of eap_method_t.process
*/
static status_t process(private_eap_sim_peer_t *this,
eap_payload_t *in, eap_payload_t **out)
METHOD(eap_method_t, process, status_t,
private_eap_sim_peer_t *this, eap_payload_t *in, eap_payload_t **out)
{
simaka_message_t *message;
status_t status;
@@ -565,28 +562,22 @@ static status_t process(private_eap_sim_peer_t *this,
return status;
}
/**
* Implementation of eap_method_t.initiate
*/
static status_t initiate(private_eap_sim_peer_t *this, eap_payload_t **out)
METHOD(eap_method_t, initiate, status_t,
private_eap_sim_peer_t *this, eap_payload_t **out)
{
/* peer never initiates */
return FAILED;
}
/**
* Implementation of eap_method_t.get_type.
*/
static eap_type_t get_type(private_eap_sim_peer_t *this, u_int32_t *vendor)
METHOD(eap_method_t, get_type, eap_type_t,
private_eap_sim_peer_t *this, u_int32_t *vendor)
{
*vendor = 0;
return EAP_SIM;
}
/**
* Implementation of eap_method_t.get_msk.
*/
static status_t get_msk(private_eap_sim_peer_t *this, chunk_t *msk)
METHOD(eap_method_t, get_msk, status_t,
private_eap_sim_peer_t *this, chunk_t *msk)
{
if (this->msk.ptr)
{
@@ -596,18 +587,14 @@ static status_t get_msk(private_eap_sim_peer_t *this, chunk_t *msk)
return FAILED;
}
/**
* Implementation of eap_method_t.is_mutual.
*/
static bool is_mutual(private_eap_sim_peer_t *this)
METHOD(eap_method_t, is_mutual, bool,
private_eap_sim_peer_t *this)
{
return TRUE;
}
/**
* Implementation of eap_method_t.destroy.
*/
static void destroy(private_eap_sim_peer_t *this)
METHOD(eap_method_t, destroy, void,
private_eap_sim_peer_t *this)
{
this->permanent->destroy(this->permanent);
DESTROY_IF(this->pseudonym);
@@ -625,28 +612,30 @@ static void destroy(private_eap_sim_peer_t *this)
eap_sim_peer_t *eap_sim_peer_create(identification_t *server,
identification_t *peer)
{
private_eap_sim_peer_t *this = malloc_thing(private_eap_sim_peer_t);
private_eap_sim_peer_t *this;
this->public.interface.initiate = (status_t(*)(eap_method_t*,eap_payload_t**))initiate;
this->public.interface.process = (status_t(*)(eap_method_t*,eap_payload_t*,eap_payload_t**))process;
this->public.interface.get_type = (eap_type_t(*)(eap_method_t*,u_int32_t*))get_type;
this->public.interface.is_mutual = (bool(*)(eap_method_t*))is_mutual;
this->public.interface.get_msk = (status_t(*)(eap_method_t*,chunk_t*))get_msk;
this->public.interface.destroy = (void(*)(eap_method_t*))destroy;
INIT(this,
.public = {
.interface = {
.initiate = _initiate,
.process = _process,
.get_type = _get_type,
.is_mutual = _is_mutual,
.get_msk = _get_msk,
.destroy = _destroy,
},
},
.crypto = simaka_crypto_create(),
);
this->crypto = simaka_crypto_create();
if (!this->crypto)
{
free(this);
return NULL;
}
this->permanent = peer->clone(peer);
this->pseudonym = NULL;
this->reauth = NULL;
this->tries = MAX_TRIES;
this->version_list = chunk_empty;
this->nonce = chunk_empty;
this->msk = chunk_empty;
return &this->public;
}
src/libcharon/plugins/eap_sim/eap_sim_server.c
+27 -40
View File
@@ -107,10 +107,8 @@ struct private_eap_sim_server_t {
/* version of SIM protocol we speak */
static chunk_t version = chunk_from_chars(0x00,0x01);
/**
* Implementation of eap_method_t.initiate
*/
static status_t initiate(private_eap_sim_server_t *this, eap_payload_t **out)
METHOD(eap_method_t, initiate, status_t,
private_eap_sim_server_t *this, eap_payload_t **out)
{
simaka_message_t *message;
@@ -479,11 +477,8 @@ static status_t process_client_error(private_eap_sim_server_t *this,
return FAILED;
}
/**
* Implementation of eap_method_t.process
*/
static status_t process(private_eap_sim_server_t *this,
eap_payload_t *in, eap_payload_t **out)
METHOD(eap_method_t, process, status_t,
private_eap_sim_server_t *this, eap_payload_t *in, eap_payload_t **out)
{
simaka_message_t *message;
status_t status;
@@ -522,19 +517,15 @@ static status_t process(private_eap_sim_server_t *this,
return status;
}
/**
* Implementation of eap_method_t.get_type.
*/
static eap_type_t get_type(private_eap_sim_server_t *this, u_int32_t *vendor)
METHOD(eap_method_t, get_type, eap_type_t,
private_eap_sim_server_t *this, u_int32_t *vendor)
{
*vendor = 0;
return EAP_SIM;
}
/**
* Implementation of eap_method_t.get_msk.
*/
static status_t get_msk(private_eap_sim_server_t *this, chunk_t *msk)
METHOD(eap_method_t, get_msk, status_t,
private_eap_sim_server_t *this, chunk_t *msk)
{
if (this->msk.ptr)
{
@@ -544,18 +535,14 @@ static status_t get_msk(private_eap_sim_server_t *this, chunk_t *msk)
return FAILED;
}
/**
* Implementation of eap_method_t.is_mutual.
*/
static bool is_mutual(private_eap_sim_server_t *this)
METHOD(eap_method_t, is_mutual, bool,
private_eap_sim_server_t *this)
{
return TRUE;
}
/**
* Implementation of eap_method_t.destroy.
*/
static void destroy(private_eap_sim_server_t *this)
METHOD(eap_method_t, destroy, void,
private_eap_sim_server_t *this)
{
this->crypto->destroy(this->crypto);
this->permanent->destroy(this->permanent);
@@ -574,29 +561,29 @@ static void destroy(private_eap_sim_server_t *this)
eap_sim_server_t *eap_sim_server_create(identification_t *server,
identification_t *peer)
{
private_eap_sim_server_t *this = malloc_thing(private_eap_sim_server_t);
private_eap_sim_server_t *this;
this->public.interface.initiate = (status_t(*)(eap_method_t*,eap_payload_t**))initiate;
this->public.interface.process = (status_t(*)(eap_method_t*,eap_payload_t*,eap_payload_t**))process;
this->public.interface.get_type = (eap_type_t(*)(eap_method_t*,u_int32_t*))get_type;
this->public.interface.is_mutual = (bool(*)(eap_method_t*))is_mutual;
this->public.interface.get_msk = (status_t(*)(eap_method_t*,chunk_t*))get_msk;
this->public.interface.destroy = (void(*)(eap_method_t*))destroy;
INIT(this,
.public = {
.interface = {
.initiate = _initiate,
.process = _process,
.get_type = _get_type,
.is_mutual = _is_mutual,
.get_msk = _get_msk,
.destroy = _destroy,
},
},
.crypto = simaka_crypto_create(),
);
this->crypto = simaka_crypto_create();
if (!this->crypto)
{
free(this);
return NULL;
}
this->permanent = peer->clone(peer);
this->pseudonym = NULL;
this->reauth = NULL;
this->sreses = chunk_empty;
this->nonce = chunk_empty;
this->msk = chunk_empty;
this->counter = chunk_empty;
this->pending = 0;
this->use_reauth = this->use_pseudonym = this->use_permanent =
lib->settings->get_bool(lib->settings,
"charon.plugins.eap-sim.request_identity", TRUE);