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

Use the AAA Identity for EAP authentication, if given

This commit is contained in:
Martin Willi 2010-08-31 18:06:02 +02:00
parent 64d7b0733f
commit 36eafea232
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libcharon/sa/authenticators/eap_authenticator.c
View File

@ -99,22 +99,30 @@ struct private_eap_authenticator_t {
static eap_method_t *load_method(private_eap_authenticator_t *this,
eap_type_t type, u_int32_t vendor, eap_role_t role)
{
identification_t *server, *peer;
identification_t *server, *peer, *aaa;
auth_cfg_t *auth;
if (role == EAP_SERVER)
{
server = this->ike_sa->get_my_id(this->ike_sa);
peer = this->ike_sa->get_other_id(this->ike_sa);
auth = this->ike_sa->get_auth_cfg(this->ike_sa, FALSE);
}
else
{
server = this->ike_sa->get_other_id(this->ike_sa);
peer = this->ike_sa->get_my_id(this->ike_sa);
auth = this->ike_sa->get_auth_cfg(this->ike_sa, TRUE);
}
if (this->eap_identity)
{
peer = this->eap_identity;
}
aaa = auth->get(auth, AUTH_RULE_AAA_IDENTITY);
if (aaa)
{
server = aaa;
}
return charon->eap->create_instance(charon->eap, type, vendor,
role, server, peer);
}

5
src/libcharon/sa/tasks/ike_auth.c
View File

@ -537,6 +537,11 @@ static status_t process_r(private_ike_auth_t *this, message_t *message)
{
cfg->add(cfg, AUTH_RULE_EAP_IDENTITY, id->clone(id));
}
id = (identification_t*)cand->get(cand, AUTH_RULE_AAA_IDENTITY);
if (id)
{
cfg->add(cfg, AUTH_RULE_AAA_IDENTITY, id->clone(id));
}
}
/* verify authentication data */