diff options
| author | Arron Wang <arron.wang@intel.com> | 2012-10-12 10:10:28 +0800 |
|---|---|---|
| committer | Zhang zhengguang <zhengguang.zhang@intel.com> | 2013-07-04 13:36:15 +0800 |
| commit | c5591d5a96c3d7bd69029cb724e51b85d8817db8 (patch) | |
| tree | 09a5ca6d5c6c3cf8fd5ca5d31044c2e6dc24d228 | |
| parent | ee8702fb20c46dfefc8242eda701a085331e2163 (diff) | |
| download | connman-c5591d5a96c3d7bd69029cb724e51b85d8817db8.tar.gz connman-c5591d5a96c3d7bd69029cb724e51b85d8817db8.tar.bz2 connman-c5591d5a96c3d7bd69029cb724e51b85d8817db8.zip | |
Tizen: Fix wifi enterprise to support SIM and AKA
Revise Wi-Fi enterprise to enable PEAP, TLS, TTLS
Fix wifi enterprise to support SIM and AKA
| -rw-r--r-- | gsupplicant/supplicant.c | 19 | ||||
| -rw-r--r-- | src/service.c | 12 |
2 files changed, 31 insertions, 0 deletions
diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c index 0f625bcb..cb2a31f3 100644 --- a/gsupplicant/supplicant.c +++ b/gsupplicant/supplicant.c @@ -3315,14 +3315,26 @@ static void add_network_security_eap(DBusMessageIter *dict, { char *eap_value; +#if defined TIZEN_EXT + if (ssid->eap == NULL) +#else if (ssid->eap == NULL || ssid->identity == NULL) +#endif return; if (g_strcmp0(ssid->eap, "tls") == 0) { add_network_security_tls(dict, ssid); } else if (g_strcmp0(ssid->eap, "peap") == 0 || g_strcmp0(ssid->eap, "ttls") == 0) { +#if defined TIZEN_EXT + if (ssid->identity == NULL) + return; +#endif add_network_security_peap(dict, ssid); +#if defined TIZEN_EXT + } else if (g_strcmp0(ssid->eap, "sim") == 0 || + g_strcmp0(ssid->eap, "aka") == 0) { +#endif } else return; @@ -3331,9 +3343,16 @@ static void add_network_security_eap(DBusMessageIter *dict, supplicant_dbus_dict_append_basic(dict, "eap", DBUS_TYPE_STRING, &eap_value); +#if defined TIZEN_EXT + if (ssid->identity != NULL) + supplicant_dbus_dict_append_basic(dict, "identity", + DBUS_TYPE_STRING, + &ssid->identity); +#else supplicant_dbus_dict_append_basic(dict, "identity", DBUS_TYPE_STRING, &ssid->identity); +#endif g_free(eap_value); } diff --git a/src/service.c b/src/service.c index 12d167f6..9ade8ab4 100644 --- a/src/service.c +++ b/src/service.c @@ -5855,12 +5855,24 @@ static int service_connect(struct connman_service *service) if (service->eap == NULL) return -EINVAL; +#if defined TIZEN_EXT + /* + * never request credentials if using EAP-TLS, EAP-SIM + * or EAP-AKA (EAP-TLS, EAP-SIM and EAP-AKA networks + * need to be fully provisioned) + */ + if (g_str_equal(service->eap, "tls") == TRUE || + g_str_equal(service->eap, "sim") == TRUE || + g_str_equal(service->eap, "aka") == TRUE) + break; +#else /* * never request credentials if using EAP-TLS * (EAP-TLS networks need to be fully provisioned) */ if (g_str_equal(service->eap, "tls") == TRUE) break; +#endif /* * Return -ENOKEY if either identity or passphrase is |