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 <j@w1.fi>
intended-for: hostap-1

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 26bb4c41e50437c68d6a3297261fbf486be99cf0..54705afe487d3502a1a6f84eff9ed125707bc5a3 100644 (file)
--- 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) {