DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Interworking: Allow EAP-SIM/AKA/AKA' override in cred block

Browse source 
The eap parameter in the cred block can now be used to override
automatic EAP-SIM/AKA/AKA' selection.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2012-09-04 16:50:52 +03:00 • committed by Jouni Malinen
parent 476aed355a
commit 7e414b21c2
1 changed files with 35 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

41
wpa_supplicant/interworking.c
View file

@ -736,6 +736,9 @@ static int interworking_connect_3gpp(struct wpa_supplicant *wpa_s,
struct wpa_cred *cred; struct wpa_cred *cred;
struct wpa_ssid *ssid; struct wpa_ssid *ssid;
const u8 *ie; const u8 *ie;
int eap_type;
int res;
char prefix;
if (bss->anqp == NULL || bss->anqp->anqp_3gpp == NULL) if (bss->anqp == NULL || bss->anqp->anqp_3gpp == NULL)
return -1; return -1;
@ -797,14 +800,40 @@ static int interworking_connect_3gpp(struct wpa_supplicant *wpa_s,
if (interworking_set_hs20_params(ssid) < 0) if (interworking_set_hs20_params(ssid) < 0)
goto fail; goto fail;
/* TODO: figure out whether to use EAP-SIM, EAP-AKA, or EAP-AKA' */ eap_type = EAP_TYPE_SIM;
if (wpa_config_set(ssid, "eap", "SIM", 0) < 0) { if (cred->pcsc && wpa_s->scard && scard_supports_umts(wpa_s->scard))
wpa_printf(MSG_DEBUG, "EAP-SIM not supported"); eap_type = EAP_TYPE_AKA;
if (cred->eap_method && cred->eap_method[0].vendor == EAP_VENDOR_IETF) {
if (cred->eap_method[0].method == EAP_TYPE_SIM ||
cred->eap_method[0].method == EAP_TYPE_AKA ||
cred->eap_method[0].method == EAP_TYPE_AKA_PRIME)
eap_type = cred->eap_method[0].method;
}
switch (eap_type) {
case EAP_TYPE_SIM:
prefix = '1';
res = wpa_config_set(ssid, "eap", "SIM", 0);
break;
case EAP_TYPE_AKA:
prefix = '0';
res = wpa_config_set(ssid, "eap", "AKA", 0);
break;
case EAP_TYPE_AKA_PRIME:
prefix = '6';
res = wpa_config_set(ssid, "eap", "AKA'", 0);
break;
default:
res = -1;
break;
}
if (res < 0) {
wpa_printf(MSG_DEBUG, "Selected EAP method (%d) not supported",
eap_type);
goto fail; goto fail;
} }
if (cred->pcsc && wpa_s->scard && scard_supports_umts(wpa_s->scard))
wpa_config_set(ssid, "eap", "AKA", 0); if (!cred->pcsc && set_root_nai(ssid, cred->imsi, prefix) < 0) {
if (!cred->pcsc && set_root_nai(ssid, cred->imsi, '1') < 0) {
wpa_printf(MSG_DEBUG, "Failed to set Root NAI"); wpa_printf(MSG_DEBUG, "Failed to set Root NAI");
goto fail; goto fail;
} }