aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorService qcabuildsw <qcabuildsw@localhost>2016-10-24 15:05:10 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-10-24 15:05:10 -0700
commitd3541d3f4c26a2d031e83a2c950b932d3c14ff09 (patch)
tree0f58e68644613ad6aad9cc6dd18fc9c69c353596
parentb02c29b98f540189b0d02cf0b0f7c12f590cd5b8 (diff)
parent415b29a14c4fcf53ef24c8405729167c9a8ebb0f (diff)
downloadandroid_external_wpa_supplicant_8-d3541d3f4c26a2d031e83a2c950b932d3c14ff09.tar.gz
android_external_wpa_supplicant_8-d3541d3f4c26a2d031e83a2c950b932d3c14ff09.tar.bz2
android_external_wpa_supplicant_8-d3541d3f4c26a2d031e83a2c950b932d3c14ff09.zip
Merge "EAP-Proxy: Consider EAP-AKA' in SelectedMethod of Status command." into wlan-aosp-service.lnx.2.0-dev
-rw-r--r--src/eap_peer/eap_proxy_qmi.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/eap_peer/eap_proxy_qmi.c b/src/eap_peer/eap_proxy_qmi.c
index 0d493723..bd132cff 100644
--- a/src/eap_peer/eap_proxy_qmi.c
+++ b/src/eap_peer/eap_proxy_qmi.c
@@ -2050,12 +2050,16 @@ int eap_proxy_sm_get_status(struct eap_proxy_sm *sm, char *buf, size_t buflen,
return 0;
if (sm->eap_type != EAP_TYPE_NONE) {
- char name[8] = "Unknown";
-
- if (sm->eap_type == EAP_TYPE_SIM)
- os_strlcpy(name, "SIM", 4);
- else if (sm->eap_type == EAP_TYPE_AKA)
- os_strlcpy(name, "AKA", 4);
+ char name[8];
+
+ if (sm->eap_type == EAP_TYPE_SIM)
+ os_strlcpy(name, "SIM", 4);
+ else if (sm->eap_type == EAP_TYPE_AKA)
+ os_strlcpy(name, "AKA", 4);
+ else if (sm->eap_type == EAP_TYPE_AKA_PRIME)
+ os_strlcpy(name, "AKA'", 5);
+ else
+ os_strlcpy(name, "Unknown", 8);
ret = os_snprintf(buf + len, buflen - len,
"selectedMethod=%d (EAP-%s)\n",