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

Migrated eap_aka plugin to INIT/METHOD macros

Browse Source
This commit is contained in:
Andreas Steffen
2011-04-05 15:20:22 +02:00
parent 05aa206dcd
commit b5240b7c64
2 changed files with 55 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/eap_aka/eap_aka_peer.c
+27 -36
View File
@@ -453,11 +453,8 @@ static status_t process_notification(private_eap_aka_peer_t *this,
}
/**
* Implementation of eap_method_t.process
*/
static status_t process(private_eap_aka_peer_t *this,
eap_payload_t *in, eap_payload_t **out)
METHOD(eap_method_t, process, status_t,
private_eap_aka_peer_t *this, eap_payload_t *in, eap_payload_t **out)
{
simaka_message_t *message;
status_t status;
@@ -499,28 +496,22 @@ static status_t process(private_eap_aka_peer_t *this,
return status;
}
/**
* Implementation of eap_method_t.initiate
*/
static status_t initiate(private_eap_aka_peer_t *this, eap_payload_t **out)
METHOD(eap_method_t, initiate, status_t,
private_eap_aka_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_aka_peer_t *this, u_int32_t *vendor)
METHOD(eap_method_t, get_type, eap_type_t,
private_eap_aka_peer_t *this, u_int32_t *vendor)
{
*vendor = 0;
return EAP_AKA;
}
/**
* Implementation of eap_method_t.get_msk.
*/
static status_t get_msk(private_eap_aka_peer_t *this, chunk_t *msk)
METHOD(eap_method_t, get_msk, status_t,
private_eap_aka_peer_t *this, chunk_t *msk)
{
if (this->msk.ptr)
{
@@ -530,18 +521,14 @@ static status_t get_msk(private_eap_aka_peer_t *this, chunk_t *msk)
return FAILED;
}
/**
* Implementation of eap_method_t.is_mutual.
*/
static bool is_mutual(private_eap_aka_peer_t *this)
METHOD(eap_method_t, is_mutual, bool,
private_eap_aka_peer_t *this)
{
return TRUE;
}
/**
* Implementation of eap_method_t.destroy.
*/
static void destroy(private_eap_aka_peer_t *this)
METHOD(eap_method_t, destroy, void,
private_eap_aka_peer_t *this)
{
this->crypto->destroy(this->crypto);
this->permanent->destroy(this->permanent);
@@ -557,25 +544,29 @@ static void destroy(private_eap_aka_peer_t *this)
eap_aka_peer_t *eap_aka_peer_create(identification_t *server,
identification_t *peer)
{
private_eap_aka_peer_t *this = malloc_thing(private_eap_aka_peer_t);
private_eap_aka_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->msk = chunk_empty;
return &this->public;
}
src/libcharon/plugins/eap_aka/eap_aka_server.c
+28 -42
View File
@@ -251,10 +251,8 @@ static status_t reauthenticate(private_eap_aka_server_t *this,
return NEED_MORE;
}
/**
* Implementation of eap_method_t.initiate
*/
static status_t initiate(private_eap_aka_server_t *this, eap_payload_t **out)
METHOD(eap_method_t, initiate, status_t,
private_eap_aka_server_t *this, eap_payload_t **out)
{
if (this->use_permanent || this->use_pseudonym || this->use_reauth)
{
@@ -560,11 +558,8 @@ static status_t process_authentication_reject(private_eap_aka_server_t *this,
return FAILED;
}
/**
* Implementation of eap_method_t.process
*/
static status_t process(private_eap_aka_server_t *this,
eap_payload_t *in, eap_payload_t **out)
METHOD(eap_method_t, process, status_t,
private_eap_aka_server_t *this, eap_payload_t *in, eap_payload_t **out)
{
simaka_message_t *message;
status_t status;
@@ -609,19 +604,15 @@ static status_t process(private_eap_aka_server_t *this,
return status;
}
/**
* Implementation of eap_method_t.get_type.
*/
static eap_type_t get_type(private_eap_aka_server_t *this, u_int32_t *vendor)
METHOD(eap_method_t, get_type, eap_type_t,
private_eap_aka_server_t *this, u_int32_t *vendor)
{
*vendor = 0;
return EAP_AKA;
}
/**
* Implementation of eap_method_t.get_msk.
*/
static status_t get_msk(private_eap_aka_server_t *this, chunk_t *msk)
METHOD(eap_method_t, get_msk, status_t,
private_eap_aka_server_t *this, chunk_t *msk)
{
if (this->msk.ptr)
{
@@ -631,18 +622,14 @@ static status_t get_msk(private_eap_aka_server_t *this, chunk_t *msk)
return FAILED;
}
/**
* Implementation of eap_method_t.is_mutual.
*/
static bool is_mutual(private_eap_aka_server_t *this)
METHOD(eap_method_t, is_mutual, bool,
private_eap_aka_server_t *this)
{
return TRUE;
}
/**
* Implementation of eap_method_t.destroy.
*/
static void destroy(private_eap_aka_server_t *this)
METHOD(eap_method_t, destroy, void,
private_eap_aka_server_t *this)
{
this->crypto->destroy(this->crypto);
this->permanent->destroy(this->permanent);
@@ -662,34 +649,33 @@ static void destroy(private_eap_aka_server_t *this)
eap_aka_server_t *eap_aka_server_create(identification_t *server,
identification_t *peer)
{
private_eap_aka_server_t *this = malloc_thing(private_eap_aka_server_t);
private_eap_aka_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->xres = chunk_empty;
this->rand = chunk_empty;
this->nonce = chunk_empty;
this->msk = chunk_empty;
this->counter = chunk_empty;
this->pending = 0;
this->synchronized = FALSE;
this->use_reauth = this->use_pseudonym = this->use_permanent =
lib->settings->get_bool(lib->settings,
"charon.plugins.eap-aka.request_identity", TRUE);
/* generate a non-zero identifier */
do {
this->identifier = random();