From 3d332fe75e9546a3b1d13042d791e1e67c276e79 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 5 May 2012 14:19:13 +0300 Subject: [PATCH] Fix SIM/USIM determination to support EAP-AKA' Both EAP-AKA and EAP-AKA' use USIM. Without this change, use of real USIM card for EAP-AKA' was not allowed to proceed, i.e., only the software simulated USIM operations were supported. Signed-hostap: Jouni Malinen intended-for: hostap-1 --- wpa_supplicant/events.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index 26bb4c41e..54705afe4 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -238,7 +238,8 @@ int wpa_supplicant_scard_init(struct wpa_supplicant *wpa_s, if (eap->vendor == EAP_VENDOR_IETF) { if (eap->method == EAP_TYPE_SIM) sim = 1; - else if (eap->method == EAP_TYPE_AKA) + else if (eap->method == EAP_TYPE_AKA || + eap->method == EAP_TYPE_AKA_PRIME) aka = 1; } eap++; @@ -247,7 +248,9 @@ int wpa_supplicant_scard_init(struct wpa_supplicant *wpa_s, if (eap_peer_get_eap_method(EAP_VENDOR_IETF, EAP_TYPE_SIM) == NULL) sim = 0; - if (eap_peer_get_eap_method(EAP_VENDOR_IETF, EAP_TYPE_AKA) == NULL) + if (eap_peer_get_eap_method(EAP_VENDOR_IETF, EAP_TYPE_AKA) == NULL && + eap_peer_get_eap_method(EAP_VENDOR_IETF, EAP_TYPE_AKA_PRIME) == + NULL) aka = 0; if (!sim && !aka) {