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

Migrated eap_simaka_pseudonym_card_t to INIT/METHOD macros.

Browse Source
This commit is contained in:
Tobias Brunner
2011-10-04 14:57:11 +02:00
parent eab73e7157
commit 0146a4a661
1 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_card.c
+27 -31
View File
@@ -57,11 +57,8 @@ static bool equals(identification_t *key1, identification_t *key2)
return key1->equals(key1, key2); return key1->equals(key1, key2);
} }
/** METHOD(simaka_card_t, get_pseudonym, identification_t*,
* Implementation of simaka_card_t.get_pseudonym private_eap_simaka_pseudonym_card_t *this, identification_t *id)
*/
static identification_t *get_pseudonym(private_eap_simaka_pseudonym_card_t *this,
identification_t *id)
{ {
identification_t *pseudonym; identification_t *pseudonym;
@@ -73,11 +70,9 @@ static identification_t *get_pseudonym(private_eap_simaka_pseudonym_card_t *this
return NULL; return NULL;
} }
/** METHOD(simaka_card_t, set_pseudonym, void,
* Implementation of simaka_card_t.set_pseudonym private_eap_simaka_pseudonym_card_t *this, identification_t *id,
*/ identification_t *pseudonym)
static void set_pseudonym(private_eap_simaka_pseudonym_card_t *this,
identification_t *id, identification_t *pseudonym)
{ {
identification_t *permanent; identification_t *permanent;
@@ -92,18 +87,16 @@ static void set_pseudonym(private_eap_simaka_pseudonym_card_t *this,
DESTROY_IF(pseudonym); DESTROY_IF(pseudonym);
} }
/** METHOD(simaka_card_t, get_quintuplet, status_t,
* Implementation of simaka_card_t.get_quintuplet private_eap_simaka_pseudonym_card_t *this, identification_t *id,
*/ char rand[AKA_RAND_LEN], char autn[AKA_AUTN_LEN], char ck[AKA_CK_LEN],
static status_t get_quintuplet() char ik[AKA_IK_LEN], char res[AKA_RES_MAX], int *res_len)
{ {
return NOT_SUPPORTED; return NOT_SUPPORTED;
} }
/** METHOD(eap_simaka_pseudonym_card_t, destroy, void,
* Implementation of eap_simaka_pseudonym_card_t.destroy. private_eap_simaka_pseudonym_card_t *this)
*/
static void destroy(private_eap_simaka_pseudonym_card_t *this)
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
identification_t *id; identification_t *id;
@@ -135,19 +128,22 @@ eap_simaka_pseudonym_card_t *eap_simaka_pseudonym_card_create()
{ {
private_eap_simaka_pseudonym_card_t *this; private_eap_simaka_pseudonym_card_t *this;
this = malloc_thing(private_eap_simaka_pseudonym_card_t); INIT(this,
.public = {
this->public.card.get_triplet = (bool(*)(simaka_card_t*, identification_t *id, char rand[SIM_RAND_LEN], char sres[SIM_SRES_LEN], char kc[SIM_KC_LEN]))return_false; .card = {
this->public.card.get_quintuplet = (status_t(*)(simaka_card_t*, identification_t *id, char rand[AKA_RAND_LEN], char autn[AKA_AUTN_LEN], char ck[AKA_CK_LEN], char ik[AKA_IK_LEN], char res[AKA_RES_MAX], int *res_len))get_quintuplet; .get_triplet = (void*)return_false,
this->public.card.resync = (bool(*)(simaka_card_t*, identification_t *id, char rand[AKA_RAND_LEN], char auts[AKA_AUTS_LEN]))return_false; .get_quintuplet = _get_quintuplet,
this->public.card.get_pseudonym = (identification_t*(*)(simaka_card_t*, identification_t *perm))get_pseudonym; .resync = (void*)return_false,
this->public.card.set_pseudonym = (void(*)(simaka_card_t*, identification_t *id, identification_t *pseudonym))set_pseudonym; .get_pseudonym = _get_pseudonym,
this->public.card.get_reauth = (identification_t*(*)(simaka_card_t*, identification_t *id, char mk[HASH_SIZE_SHA1], u_int16_t *counter))return_null; .set_pseudonym = _set_pseudonym,
this->public.card.set_reauth = (void(*)(simaka_card_t*, identification_t *id, identification_t* next, char mk[HASH_SIZE_SHA1], u_int16_t counter))nop; .get_reauth = (void*)return_null,
this->public.destroy = (void(*)(eap_simaka_pseudonym_card_t*))destroy; .set_reauth = (void*)nop,
},
this->pseudonym = hashtable_create((void*)hash, (void*)equals, 0); .destroy = _destroy,
this->permanent = hashtable_create((void*)hash, (void*)equals, 0); },
.pseudonym = hashtable_create((void*)hash, (void*)equals, 0),
.permanent = hashtable_create((void*)hash, (void*)equals, 0),
);
return &this->public; return &this->public;
} }