Added support of EAP-FAST, EAP-PWD and EAP-AKA'.

Change-Id: I3f52d3211611c809d9024363b9807c61127e0bd5
Signed-off-by: Niraj Kumar Goit <niraj.g@samsung.com>

diff --git a/include/network_wlan.h b/include/network_wlan.h
index ea26d8bca70b1996be1b58cfd9dd8031f7ea375f..6f16683f06059e695419c4e0fb50c9f84ab3297b 100755 (executable)
--- a/include/network_wlan.h
+++ b/include/network_wlan.h
@@ -139,6 +139,9 @@ typedef enum {
        WLAN_SEC_EAP_TYPE_TTLS,                         /** EAP TTLS type */
        WLAN_SEC_EAP_TYPE_SIM,                          /** EAP SIM type */
        WLAN_SEC_EAP_TYPE_AKA,                          /** EAP AKA type */
+       WLAN_SEC_EAP_TYPE_AKA_PRIME,                    /** EAP AKA Prime type */
+       WLAN_SEC_EAP_TYPE_FAST,                         /** EAP FAST type */
+       WLAN_SEC_EAP_TYPE_PWD,                          /** EAP PWD type */
 } wlan_eap_type_e;
 
 /**

diff --git a/include/wifi-manager.h b/include/wifi-manager.h
index c90fb492bb2506bc52d99fc7f7144af9217813d0..6fad29e636392198506e945608d8db867913a5ec 100755 (executable)
--- a/include/wifi-manager.h
+++ b/include/wifi-manager.h
@@ -393,6 +393,9 @@ typedef enum {
        WIFI_MANAGER_EAP_TYPE_TTLS = 2,         /**< EAP TTLS type */
        WIFI_MANAGER_EAP_TYPE_SIM = 3,          /**< EAP SIM type */
        WIFI_MANAGER_EAP_TYPE_AKA = 4,          /**< EAP AKA type */
+       WIFI_MANAGER_EAP_TYPE_AKA_PRIME = 5,    /**< EAP AKA Prime type */
+       WIFI_MANAGER_EAP_TYPE_FAST = 6,         /**< EAP FAST type */
+       WIFI_MANAGER_EAP_TYPE_PWD = 7,          /**< EAP PWD type */
 } wifi_manager_eap_type_e;
 
 /**

diff --git a/src/network_internal.c b/src/network_internal.c
index b44898f609bf47005388268c3b523b73fec2b233..0f59f3ae66662a7543547b4af9c0dff2e0592094 100755 (executable)
--- a/src/network_internal.c
+++ b/src/network_internal.c
@@ -58,6 +58,15 @@ static char *__convert_eap_type_to_string(gchar eap_type)
        case WLAN_SEC_EAP_TYPE_AKA:
                return "aka";
 
+       case WLAN_SEC_EAP_TYPE_AKA_PRIME:
+               return "aka'";
+
+       case WLAN_SEC_EAP_TYPE_FAST:
+               return "fast";
+
+       case WLAN_SEC_EAP_TYPE_PWD:
+               return "pwd";
+
        default:
                return NULL;
        }

diff --git a/src/wifi_ap.c b/src/wifi_ap.c
index dc1cf6b61c59041a43b2841ec57e8608eb91b927..3df657e351456bae2f51c0bd0cca06fcdcfe2669 100755 (executable)
--- a/src/wifi_ap.c
+++ b/src/wifi_ap.c
@@ -2164,6 +2164,15 @@ EXPORT_API int wifi_manager_ap_set_eap_type(wifi_manager_ap_h ap,
        case WIFI_MANAGER_EAP_TYPE_AKA:
                profile_info->security_info.authentication.eap.eap_type = WLAN_SEC_EAP_TYPE_AKA;
                break;
+       case WIFI_MANAGER_EAP_TYPE_AKA_PRIME:
+               profile_info->security_info.authentication.eap.eap_type = WLAN_SEC_EAP_TYPE_AKA_PRIME;
+               break;
+       case WIFI_MANAGER_EAP_TYPE_FAST:
+               profile_info->security_info.authentication.eap.eap_type = WLAN_SEC_EAP_TYPE_FAST;
+               break;
+       case WIFI_MANAGER_EAP_TYPE_PWD:
+               profile_info->security_info.authentication.eap.eap_type = WLAN_SEC_EAP_TYPE_PWD;
+               break;
        default:
                __NETWORK_CAPI_FUNC_EXIT__;
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER;

diff --git a/src/wifi_internal.c b/src/wifi_internal.c
index 48d66db238153e09897d57992b22e66b2d8df86a..662340d2db43e5ddbeeab32edf40189a4baa33ce 100755 (executable)
--- a/src/wifi_internal.c
+++ b/src/wifi_internal.c
@@ -239,6 +239,15 @@ gchar *_wifi_eap_type_to_string(wifi_manager_eap_type_e eap_type)
        case WIFI_MANAGER_EAP_TYPE_AKA:
                type = g_strdup("AKA");
                break;
+       case WIFI_MANAGER_EAP_TYPE_AKA_PRIME:
+               type = g_strdup("AKA'");
+               break;
+       case WIFI_MANAGER_EAP_TYPE_FAST:
+               type = g_strdup("FAST");
+               break;
+       case WIFI_MANAGER_EAP_TYPE_PWD:
+               type = g_strdup("PWD");
+               break;
        }
        return type;
 }

diff --git a/test/wifi_manager_test.c b/test/wifi_manager_test.c
index 1b9da69b918ef4acefe62d52567a07ec509399b4..7540b6d1606edab7ba39d74133dfc3e6fd9eb754 100755 (executable)
--- a/test/wifi_manager_test.c
+++ b/test/wifi_manager_test.c
@@ -523,6 +523,9 @@ static bool __test_found_eap_ap_callback(wifi_manager_ap_h ap, void *user_data)
                printf("2 -> WIFI_MANAGER_EAP_TYPE_TTLS\n");
                printf("3 -> WIFI_MANAGER_EAP_TYPE_SIM\n");
                printf("4 -> WIFI_MANAGER_EAP_TYPE_AKA\n");
+               printf("5 -> WIFI_MANAGER_EAP_TYPE_AKA_PRIME\n");
+               printf("6 -> WIFI_MANAGER_EAP_TYPE_FAST\n");
+               printf("7 -> WIFI_MANAGER_EAP_TYPE_PWD\n");
                rv = scanf("%d", &input_int);
 
                rv = wifi_manager_ap_set_eap_type(ap, input_int);
@@ -543,23 +546,23 @@ static bool __test_found_eap_ap_callback(wifi_manager_ap_h ap, void *user_data)
                                g_free(ap_name);
                                return false;
                        }
+               }
 
-                       printf("Input EAP authentication type:\n");
-                       printf("0 -> WIFI_MANAGER_EAP_AUTH_TYPE_NONE\n");
-                       printf("1 -> WIFI_MANAGER_EAP_AUTH_TYPE_PAP\n");
-                       printf("2 -> WIFI_MANAGER_EAP_AUTH_TYPE_MSCHAP\n");
-                       printf("3 -> WIFI_MANAGER_EAP_AUTH_TYPE_MSCHAPV2\n");
-                       printf("4 -> WIFI_MANAGER_EAP_AUTH_TYPE_GTC\n");
-                       printf("5 -> WIFI_MANAGER_EAP_AUTH_TYPE_MD5\n");
-                       rv = scanf("%d", &input_int);
+               printf("Input EAP authentication type:\n");
+               printf("0 -> WIFI_MANAGER_EAP_AUTH_TYPE_NONE\n");
+               printf("1 -> WIFI_MANAGER_EAP_AUTH_TYPE_PAP\n");
+               printf("2 -> WIFI_MANAGER_EAP_AUTH_TYPE_MSCHAP\n");
+               printf("3 -> WIFI_MANAGER_EAP_AUTH_TYPE_MSCHAPV2\n");
+               printf("4 -> WIFI_MANAGER_EAP_AUTH_TYPE_GTC\n");
+               printf("5 -> WIFI_MANAGER_EAP_AUTH_TYPE_MD5\n");
+               rv = scanf("%d", &input_int);
 
-                       rv = wifi_manager_ap_set_eap_auth_type(ap, input_int);
-                       if (rv != WIFI_MANAGER_ERROR_NONE) {
-                               printf("Fail to set eap auth type : %s\n",
-                                               __test_convert_error_to_string(rv));
-                               g_free(ap_name);
-                               return false;
-                       }
+               rv = wifi_manager_ap_set_eap_auth_type(ap, input_int);
+               if (rv != WIFI_MANAGER_ERROR_NONE) {
+                       printf("Fail to set eap auth type : %s\n",
+                                       __test_convert_error_to_string(rv));
+                       g_free(ap_name);
+                       return false;
                }
 
                rv = wifi_manager_connect(wifi, ap, __test_connected_callback, NULL);

diff --git a/tool/wifi_mgr_tool.c b/tool/wifi_mgr_tool.c
index 8602a0db1790161fd8128a5f51f0567c32aacb8d..f6a2a58d8eb2d937c961ff193397b6ff54ab3951 100755 (executable)
--- a/tool/wifi_mgr_tool.c
+++ b/tool/wifi_mgr_tool.c
@@ -327,6 +327,12 @@ const char *test_wifi_mgr_eap_type_to_string(wifi_manager_eap_type_e type)
                return "SIM";
        case WIFI_MANAGER_EAP_TYPE_AKA:
                return "AKA";
+       case WIFI_MANAGER_EAP_TYPE_AKA_PRIME:
+               return "AKA'";
+       case WIFI_MANAGER_EAP_TYPE_FAST:
+               return "FAST";
+       case WIFI_MANAGER_EAP_TYPE_PWD:
+               return "PWD";
        }
 
        return "Unknown";