Wi-Fi Enterprise SIM and AKA

[Team] Data Network
[Problem issues #] N/A
[Cause] N/A
[Solution] N/A
Enable Wi-Fi Enterprise SIM and AKA

Change-Id: Ica300d94c0c593cfa339a2ba21034d1b5e419d57

diff --git a/debian/changelog b/debian/changelog
index f925c6a..e319f6b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+connman (0.78.4-0slp2+80) unstable; urgency=low
+
+  * Wi-Fi enterprise SIM and AKA
+  * Git: slp/pkgs/c/connman
+  * Tag: connman_0.78.4-0slp2+80
+
+ -- Danny Jeongseok Seo <s.seo@samsung.com>  Sun, 13 May 2012 17:36:37 +0900
+
 connman (0.78.4-0slp2+79) unstable; urgency=low
 
   * Revise Wi-Fi enterprise to enable PEAP, TLS, TTLS

diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c
index 8d793b5..6dba185 100644 (file)
--- a/gsupplicant/supplicant.c
+++ b/gsupplicant/supplicant.c
@@ -2981,14 +2981,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;
 
@@ -2997,9 +3009,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 471d624..7122563 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -5162,12 +5162,23 @@ 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