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

Migrated eap_aka_3gpp2_functions_t to INIT/METHOD macros.

Browse Source
This commit is contained in:
Tobias Brunner
2011-10-04 15:28:41 +02:00
parent 4ceda4b79b
commit bdc8d0aa90
1 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_functions.c
+38 -33
View File
@@ -284,9 +284,10 @@ static void f5x(prf_t *prf, u_char f, u_char k[AKA_K_LEN],
/** /**
* Calculate MAC from RAND, SQN, AMF using K * Calculate MAC from RAND, SQN, AMF using K
*/ */
static void f1(private_eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN], METHOD(eap_aka_3gpp2_functions_t, f1, void,
u_char rand[AKA_RAND_LEN], u_char sqn[AKA_SQN_LEN], private_eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN],
u_char amf[AKA_AMF_LEN], u_char mac[AKA_MAC_LEN]) u_char rand[AKA_RAND_LEN], u_char sqn[AKA_SQN_LEN],
u_char amf[AKA_AMF_LEN], u_char mac[AKA_MAC_LEN])
{ {
f1x(this->prf, F1, k, rand, sqn, amf, mac); f1x(this->prf, F1, k, rand, sqn, amf, mac);
DBG3(DBG_IKE, "MAC %b", mac, AKA_MAC_LEN); DBG3(DBG_IKE, "MAC %b", mac, AKA_MAC_LEN);
@@ -295,9 +296,10 @@ static void f1(private_eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN],
/** /**
* Calculate MACS from RAND, SQN, AMF using K * Calculate MACS from RAND, SQN, AMF using K
*/ */
static void f1star(private_eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN], METHOD(eap_aka_3gpp2_functions_t, f1star, void,
u_char rand[AKA_RAND_LEN], u_char sqn[AKA_SQN_LEN], private_eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN],
u_char amf[AKA_AMF_LEN], u_char macs[AKA_MAC_LEN]) u_char rand[AKA_RAND_LEN], u_char sqn[AKA_SQN_LEN],
u_char amf[AKA_AMF_LEN], u_char macs[AKA_MAC_LEN])
{ {
f1x(this->prf, F1STAR, k, rand, sqn, amf, macs); f1x(this->prf, F1STAR, k, rand, sqn, amf, macs);
DBG3(DBG_IKE, "MACS %b", macs, AKA_MAC_LEN); DBG3(DBG_IKE, "MACS %b", macs, AKA_MAC_LEN);
@@ -306,8 +308,9 @@ static void f1star(private_eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN],
/** /**
* Calculate RES from RAND using K * Calculate RES from RAND using K
*/ */
static void f2(private_eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN], METHOD(eap_aka_3gpp2_functions_t, f2, void,
u_char rand[AKA_RAND_LEN], u_char res[AKA_RES_MAX]) private_eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN],
u_char rand[AKA_RAND_LEN], u_char res[AKA_RES_MAX])
{ {
fx(this->prf, F2, k, rand, res); fx(this->prf, F2, k, rand, res);
DBG3(DBG_IKE, "RES %b", res, AKA_RES_MAX); DBG3(DBG_IKE, "RES %b", res, AKA_RES_MAX);
@@ -316,8 +319,9 @@ static void f2(private_eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN],
/** /**
* Calculate CK from RAND using K * Calculate CK from RAND using K
*/ */
static void f3(private_eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN], METHOD(eap_aka_3gpp2_functions_t, f3, void,
u_char rand[AKA_RAND_LEN], u_char ck[AKA_CK_LEN]) private_eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN],
u_char rand[AKA_RAND_LEN], u_char ck[AKA_CK_LEN])
{ {
fx(this->prf, F3, k, rand, ck); fx(this->prf, F3, k, rand, ck);
DBG3(DBG_IKE, "CK %b", ck, AKA_CK_LEN); DBG3(DBG_IKE, "CK %b", ck, AKA_CK_LEN);
@@ -326,8 +330,9 @@ static void f3(private_eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN],
/** /**
* Calculate IK from RAND using K * Calculate IK from RAND using K
*/ */
static void f4(private_eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN], METHOD(eap_aka_3gpp2_functions_t, f4, void,
u_char rand[AKA_RAND_LEN], u_char ik[AKA_IK_LEN]) private_eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN],
u_char rand[AKA_RAND_LEN], u_char ik[AKA_IK_LEN])
{ {
fx(this->prf, F4, k, rand, ik); fx(this->prf, F4, k, rand, ik);
DBG3(DBG_IKE, "IK %b", ik, AKA_IK_LEN); DBG3(DBG_IKE, "IK %b", ik, AKA_IK_LEN);
@@ -336,8 +341,9 @@ static void f4(private_eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN],
/** /**
* Calculate AK from a RAND using K * Calculate AK from a RAND using K
*/ */
static void f5(private_eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN], METHOD(eap_aka_3gpp2_functions_t, f5, void,
u_char rand[AKA_RAND_LEN], u_char ak[AKA_AK_LEN]) private_eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN],
u_char rand[AKA_RAND_LEN], u_char ak[AKA_AK_LEN])
{ {
f5x(this->prf, F5, k, rand, ak); f5x(this->prf, F5, k, rand, ak);
DBG3(DBG_IKE, "AK %b", ak, AKA_AK_LEN); DBG3(DBG_IKE, "AK %b", ak, AKA_AK_LEN);
@@ -346,18 +352,16 @@ static void f5(private_eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN],
/** /**
* Calculate AKS from a RAND using K * Calculate AKS from a RAND using K
*/ */
static void f5star(private_eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN], METHOD(eap_aka_3gpp2_functions_t, f5star, void,
u_char rand[AKA_RAND_LEN], u_char aks[AKA_AK_LEN]) private_eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN],
u_char rand[AKA_RAND_LEN], u_char aks[AKA_AK_LEN])
{ {
f5x(this->prf, F5STAR, k, rand, aks); f5x(this->prf, F5STAR, k, rand, aks);
DBG3(DBG_IKE, "AKS %b", aks, AKA_AK_LEN); DBG3(DBG_IKE, "AKS %b", aks, AKA_AK_LEN);
} }
METHOD(eap_aka_3gpp2_functions_t, destroy, void,
/** private_eap_aka_3gpp2_functions_t *this)
* Implementation of eap_aka_3gpp2_functions_t.destroy.
*/
static void destroy(private_eap_aka_3gpp2_functions_t *this)
{ {
this->prf->destroy(this->prf); this->prf->destroy(this->prf);
free(this); free(this);
@@ -370,18 +374,19 @@ eap_aka_3gpp2_functions_t *eap_aka_3gpp2_functions_create()
{ {
private_eap_aka_3gpp2_functions_t *this; private_eap_aka_3gpp2_functions_t *this;
this = malloc_thing(private_eap_aka_3gpp2_functions_t); INIT(this,
.public = {
this->public.f1 = (void(*)(eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN], u_char rand[AKA_RAND_LEN], u_char sqn[AKA_SQN_LEN], u_char amf[AKA_AMF_LEN], u_char mac[AKA_MAC_LEN]))f1; .f1 = _f1,
this->public.f1star = (void(*)(eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN], u_char rand[AKA_RAND_LEN], u_char sqn[AKA_SQN_LEN], u_char amf[AKA_AMF_LEN], u_char macs[AKA_MAC_LEN]))f1star; .f1star = _f1star,
this->public.f2 = (void(*)(eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN], u_char rand[AKA_RAND_LEN], u_char res[AKA_RES_MAX]))f2; .f2 = _f2,
this->public.f3 = (void(*)(eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN], u_char rand[AKA_RAND_LEN], u_char ck[AKA_CK_LEN]))f3; .f3 = _f3,
this->public.f4 = (void(*)(eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN], u_char rand[AKA_RAND_LEN], u_char ik[AKA_IK_LEN]))f4; .f4 = _f4,
this->public.f5 = (void(*)(eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN], u_char rand[AKA_RAND_LEN], u_char ak[AKA_AK_LEN]))f5; .f5 = _f5,
this->public.f5star = (void(*)(eap_aka_3gpp2_functions_t *this, u_char k[AKA_K_LEN], u_char rand[AKA_RAND_LEN], u_char aks[AKA_AK_LEN]))f5star; .f5star = _f5star,
this->public.destroy = (void(*)(eap_aka_3gpp2_functions_t*))destroy; .destroy = _destroy,
},
this->prf = lib->crypto->create_prf(lib->crypto, PRF_KEYED_SHA1); .prf = lib->crypto->create_prf(lib->crypto, PRF_KEYED_SHA1),
);
if (!this->prf) if (!this->prf)
{ {
DBG1(DBG_CFG, "%N not supported, unable to use 3GPP2 algorithm", DBG1(DBG_CFG, "%N not supported, unable to use 3GPP2 algorithm",