ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

Migrated eap_md5 plugin to INIT/METHOD macros

This commit is contained in:
Andreas Steffen 2010-08-13 16:33:26 +02:00
parent 45c4021bd0
commit a568897011
2 changed files with 60 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
src/libcharon/plugins/eap_md5/eap_md5.c
View File

@ -105,19 +105,15 @@ static status_t hash_challenge(private_eap_md5_t *this, chunk_t *response,
return SUCCESS; return SUCCESS;
} }
/** METHOD(eap_method_t, initiate_peer, status_t,
* Implementation of eap_method_t.initiate for the peer private_eap_md5_t *this, eap_payload_t **out)
*/
static status_t initiate_peer(private_eap_md5_t *this, eap_payload_t **out)
{ {
/* peer never initiates */ /* peer never initiates */
return FAILED; return FAILED;
} }
/** METHOD(eap_method_t, initiate_server, status_t,
* Implementation of eap_method_t.initiate for the server private_eap_md5_t *this, eap_payload_t **out)
*/
static status_t initiate_server(private_eap_md5_t *this, eap_payload_t **out)
{ {
rng_t *rng; rng_t *rng;
eap_md5_header_t *req; eap_md5_header_t *req;
@ -142,11 +138,8 @@ static status_t initiate_server(private_eap_md5_t *this, eap_payload_t **out)
return NEED_MORE; return NEED_MORE;
} }
/** METHOD(eap_method_t, process_peer, status_t,
* Implementation of eap_method_t.process for the peer private_eap_md5_t *this, eap_payload_t *in, eap_payload_t **out)
*/
static status_t process_peer(private_eap_md5_t *this,
eap_payload_t *in, eap_payload_t **out)
{ {
chunk_t response; chunk_t response;
chunk_t data; chunk_t data;
@ -177,11 +170,8 @@ static status_t process_peer(private_eap_md5_t *this,
return NEED_MORE; return NEED_MORE;
} }
/** METHOD(eap_method_t, process_server, status_t,
* Implementation of eap_method_t.process for the server private_eap_md5_t *this, eap_payload_t *in, eap_payload_t **out)
*/
static status_t process_server(private_eap_md5_t *this,
eap_payload_t *in, eap_payload_t **out)
{ {
chunk_t response, expected; chunk_t response, expected;
chunk_t data; chunk_t data;
@ -209,35 +199,27 @@ static status_t process_server(private_eap_md5_t *this,
return SUCCESS; return SUCCESS;
} }
/** METHOD(eap_method_t, get_type, eap_type_t,
* Implementation of eap_method_t.get_type. private_eap_md5_t *this, u_int32_t *vendor)
*/
static eap_type_t get_type(private_eap_md5_t *this, u_int32_t *vendor)
{ {
*vendor = 0; *vendor = 0;
return EAP_MD5; return EAP_MD5;
} }
/** METHOD(eap_method_t, get_msk, status_t,
* Implementation of eap_method_t.get_msk. private_eap_md5_t *this, chunk_t *msk)
*/
static status_t get_msk(private_eap_md5_t *this, chunk_t *msk)
{ {
return FAILED; return FAILED;
} }
/** METHOD(eap_method_t, is_mutual, bool,
* Implementation of eap_method_t.is_mutual. private_eap_md5_t *this)
*/
static bool is_mutual(private_eap_md5_t *this)
{ {
return FALSE; return FALSE;
} }
/** METHOD(eap_method_t, destroy, void,
* Implementation of eap_method_t.destroy. private_eap_md5_t *this)
*/
static void destroy(private_eap_md5_t *this)
{ {
this->peer->destroy(this->peer); this->peer->destroy(this->peer);
this->server->destroy(this->server); this->server->destroy(this->server);
@ -245,39 +227,29 @@ static void destroy(private_eap_md5_t *this)
free(this); free(this);
} }
/**
* Generic constructor
*/
static private_eap_md5_t *eap_md5_create_generic(identification_t *server,
identification_t *peer)
{
private_eap_md5_t *this = malloc_thing(private_eap_md5_t);
this->public.eap_method_interface.initiate = NULL;
this->public.eap_method_interface.process = NULL;
this->public.eap_method_interface.get_type = (eap_type_t(*)(eap_method_t*,u_int32_t*))get_type;
this->public.eap_method_interface.is_mutual = (bool(*)(eap_method_t*))is_mutual;
this->public.eap_method_interface.get_msk = (status_t(*)(eap_method_t*,chunk_t*))get_msk;
this->public.eap_method_interface.destroy = (void(*)(eap_method_t*))destroy;
/* private data */
this->peer = peer->clone(peer);
this->server = server->clone(server);
this->challenge = chunk_empty;
this->identifier = 0;
return this;
}
/* /*
* see header * See header
*/ */
eap_md5_t *eap_md5_create_server(identification_t *server, identification_t *peer) eap_md5_t *eap_md5_create_server(identification_t *server, identification_t *peer)
{ {
private_eap_md5_t *this = eap_md5_create_generic(server, peer); private_eap_md5_t *this;
this->public.eap_method_interface.initiate = (status_t(*)(eap_method_t*,eap_payload_t**))initiate_server; INIT(this,
this->public.eap_method_interface.process = (status_t(*)(eap_method_t*,eap_payload_t*,eap_payload_t**))process_server; .public = {
.eap_method_interface = {
.initiate = _initiate_server,
.process = _process_server,
.get_type = _get_type,
.is_mutual = _is_mutual,
.get_msk = _get_msk,
.destroy = _destroy,
},
},
.peer = peer->clone(peer),
.server = server->clone(server),
.challenge = chunk_empty,
.identifier = 0,
);
/* generate a non-zero identifier */ /* generate a non-zero identifier */
do { do {
@ -288,14 +260,28 @@ eap_md5_t *eap_md5_create_server(identification_t *server, identification_t *pee
} }
/* /*
* see header * See header
*/ */
eap_md5_t *eap_md5_create_peer(identification_t *server, identification_t *peer) eap_md5_t *eap_md5_create_peer(identification_t *server, identification_t *peer)
{ {
private_eap_md5_t *this = eap_md5_create_generic(server, peer); private_eap_md5_t *this;
this->public.eap_method_interface.initiate = (status_t(*)(eap_method_t*,eap_payload_t**))initiate_peer; INIT(this,
this->public.eap_method_interface.process = (status_t(*)(eap_method_t*,eap_payload_t*,eap_payload_t**))process_peer; .public = {
.eap_method_interface = {
.initiate = _initiate_peer,
.process = _process_peer,
.get_type = _get_type,
.is_mutual = _is_mutual,
.get_msk = _get_msk,
.destroy = _destroy,
},
},
.peer = peer->clone(peer),
.server = server->clone(server),
.challenge = chunk_empty,
.identifier = 0,
);
return &this->public; return &this->public;
} }

15
src/libcharon/plugins/eap_md5/eap_md5_plugin.c
View File

@ -14,15 +14,12 @@
*/ */
#include "eap_md5_plugin.h" #include "eap_md5_plugin.h"
#include "eap_md5.h" #include "eap_md5.h"
#include <daemon.h> #include <daemon.h>
/** METHOD(plugin_t, destroy, void,
* Implementation of plugin_t.destroy eap_md5_plugin_t *this)
*/
static void destroy(eap_md5_plugin_t *this)
{ {
charon->eap->remove_method(charon->eap, charon->eap->remove_method(charon->eap,
(eap_constructor_t)eap_md5_create_server); (eap_constructor_t)eap_md5_create_server);
@ -36,9 +33,13 @@ static void destroy(eap_md5_plugin_t *this)
*/ */
plugin_t *eap_md5_plugin_create() plugin_t *eap_md5_plugin_create()
{ {
eap_md5_plugin_t *this = malloc_thing(eap_md5_plugin_t); eap_md5_plugin_t *this;
this->plugin.destroy = (void(*)(plugin_t*))destroy; INIT(this,
.plugin = {
.destroy = _destroy,
},
);
charon->eap->add_method(charon->eap, EAP_MD5, 0, EAP_SERVER, charon->eap->add_method(charon->eap, EAP_MD5, 0, EAP_SERVER,
(eap_constructor_t)eap_md5_create_server); (eap_constructor_t)eap_md5_create_server);