jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

EAP-AKA server: Require AKA/Identity response to include identity

Browse source 
Since we always request an identity in the request, the response
has to include AT_IDENTITY. This allows the AKA/Identity response
processing to be simplified a bit.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2012-09-01 19:23:14 +03:00
parent b4569a3bd8
commit 02a0ce13bc
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/eap_server/eap_server_aka.c
View file

@ -773,6 +773,8 @@ static void eap_aka_process_identity(struct eap_sm *sm,
struct wpabuf *respData, struct wpabuf *respData,
struct eap_sim_attrs *attr) struct eap_sim_attrs *attr)
{ {
u8 *new_identity;
wpa_printf(MSG_DEBUG, "EAP-AKA: Processing Identity"); wpa_printf(MSG_DEBUG, "EAP-AKA: Processing Identity");
if (attr->mac || attr->iv || attr->encr_data) { if (attr->mac || attr->iv || attr->encr_data) {
@ -783,16 +785,29 @@ static void eap_aka_process_identity(struct eap_sm *sm,
return; return;
} }
if (attr->identity) { /*
os_free(sm->identity); * We always request identity with AKA/Identity, so the peer is
sm->identity = os_malloc(attr->identity_len); * required to have replied with one.
if (sm->identity) { */
os_memcpy(sm->identity, attr->identity, if (!attr->identity || attr->identity_len == 0) {
attr->identity_len); wpa_printf(MSG_DEBUG, "EAP-AKA: Peer did not provide any "
sm->identity_len = attr->identity_len; "identity");
} data->notification = EAP_SIM_GENERAL_FAILURE_BEFORE_AUTH;
eap_aka_state(data, NOTIFICATION);
return;
} }
new_identity = os_malloc(attr->identity_len);
if (new_identity == NULL) {
data->notification = EAP_SIM_GENERAL_FAILURE_BEFORE_AUTH;
eap_aka_state(data, NOTIFICATION);
return;
}
os_free(sm->identity);
sm->identity = new_identity;
os_memcpy(sm->identity, attr->identity, attr->identity_len);
sm->identity_len = attr->identity_len;
eap_aka_determine_identity(sm, data, 0, 0); eap_aka_determine_identity(sm, data, 0, 0);
if (eap_get_id(respData) == data->pending_id) { if (eap_get_id(respData) == data->pending_id) {
data->pending_id = -1; data->pending_id = -1;