Added support of WPA3-SAE security mode.

Change-Id: I44114045b9716defe4e467007a1d32d2df38b1ef
Signed-off-by: Niraj Kumar Goit <niraj.g@samsung.com>
Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>

diff --git a/include/network_wlan.h b/include/network_wlan.h
index cd133d0137c37f9a2333bb04c6bc7e5536c98e79..58264aac137290fe58efe8783ab1be20770cd634 100755 (executable)
--- a/include/network_wlan.h
+++ b/include/network_wlan.h
@@ -53,6 +53,11 @@ extern "C" {
  */
 #define NET_WLAN_MAX_PSK_PASSPHRASE_LEN                        65
 
+/**
+ * Length of SAE Key
+ */
+#define NET_WLAN_MAX_SAE_PASSPHRASE_LEN                        65
+
 /**
  * Length of WEP Key
  * Max of 10 Hex digits allowed in case of 64 bit encryption
@@ -114,6 +119,7 @@ typedef enum {
        WLAN_SEC_MODE_WPA_PSK,                          /** WPA-PSK */
        WLAN_SEC_MODE_WPA2_PSK,                         /** WPA2-PSK */
        WLAN_SEC_MODE_WPA_FT_PSK,
+       WLAN_SEC_MODE_SAE,                              /** SAE */
 } wlan_security_mode_type_e;
 
 /**
@@ -181,6 +187,14 @@ typedef struct {
        char pskKey[NET_WLAN_MAX_PSK_PASSPHRASE_LEN + 1];       /** key value for WPA-PSK or WPA2-PSK */
 } wlan_psk_info_s;
 
+/**
+ * Below structure is used by WPA3-SAE
+ * To see the maximum length of SAE passphrase key.
+ */
+typedef struct {
+       char saeKey[NET_WLAN_MAX_SAE_PASSPHRASE_LEN + 1];       /** key value for WPA3-SAE */
+} wlan_sae_info_s;
+
 /**
  * Below structure is used by WEP
  * To see the maximum length of WEP key.
@@ -220,6 +234,7 @@ typedef union {
        wlan_wep_info_s wep;                                    /** Wep Authentication */
        wlan_psk_info_s psk;                                    /** psk Authentication */
        wlan_eap_info_s eap;                                    /** eap Authentication */
+       wlan_sae_info_s sae;                                    /** sae Authentication */
 } wlan_auth_info_u;
 
 /**

diff --git a/include/wifi-manager.h b/include/wifi-manager.h
index 60ae2abd7211d22ccdd086417fa07d07b5761061..704284526c6fffe475e102d2d26724251ebe6caa 100755 (executable)
--- a/include/wifi-manager.h
+++ b/include/wifi-manager.h
@@ -374,6 +374,7 @@ typedef enum {
        WIFI_MANAGER_SECURITY_TYPE_WPA2_PSK = 3,    /**< WPA2-PSK */
        WIFI_MANAGER_SECURITY_TYPE_EAP = 4,         /**< EAP */
        WIFI_MANAGER_SECURITY_TYPE_WPA_FT_PSK = 5,  /**< FT-PSK (Since 5.0) */
+       WIFI_MANAGER_SECURITY_TYPE_SAE = 6,    /**< SAE (Since 5.5) */
 } wifi_manager_security_type_e;
 
 /**

diff --git a/src/network_interface.c b/src/network_interface.c
index 4b63a180b076b3a46f6ae78fef1087909116ad2d..b6c5f0faff47415b7885a864c132d1c98ccb730f 100755 (executable)
--- a/src/network_interface.c
+++ b/src/network_interface.c
@@ -858,6 +858,9 @@ static int __net_extract_wifi_info(GVariantIter *array, net_profile_info_s* Prof
                                else if (g_strcmp0(value, "rsn") == 0 &&
                                                 ProfInfo->security_info.sec_mode < WLAN_SEC_MODE_WPA_PSK)
                                        ProfInfo->security_info.sec_mode = WLAN_SEC_MODE_WPA2_PSK;
+                               else if (g_strcmp0(value, "sae") == 0 &&
+                                                ProfInfo->security_info.sec_mode < WLAN_SEC_MODE_SAE)
+                                       ProfInfo->security_info.sec_mode = WLAN_SEC_MODE_SAE;
                                else if (g_strcmp0(value, "wps") == 0)
                                        ProfInfo->security_info.wps_support = TRUE;
                                else if (ProfInfo->security_info.sec_mode < WLAN_SEC_MODE_NONE)

diff --git a/src/network_internal.c b/src/network_internal.c
index 6ecc61b2a31b983b683216e5b6e9fe4cbf94e0eb..15f65f2d95fb08577238aed85f1664ea8b2ba6ac 100755 (executable)
--- a/src/network_internal.c
+++ b/src/network_internal.c
@@ -274,13 +274,19 @@ int _net_open_connection_with_wifi_info(const net_wifi_connection_info_s* wifi_i
                wifi_connection_info.passphrase =
                                (char *)wifi_info->security_info.authentication.psk.pskKey;
                break;
+
        case WLAN_SEC_MODE_WPA_FT_PSK:
                wifi_connection_info.security = "ft_psk";
                wifi_connection_info.passphrase =
                                (char *)wifi_info->security_info.authentication.psk.pskKey;
                break;
 
-
+       /** SAE supported */
+       case WLAN_SEC_MODE_SAE:
+               wifi_connection_info.security = "sae";
+               wifi_connection_info.passphrase =
+                               (char *)wifi_info->security_info.authentication.sae.saeKey;
+               break;
 
        case WLAN_SEC_MODE_IEEE8021X:
                wifi_connection_info.security = "ieee8021x";

diff --git a/src/network_signal.c b/src/network_signal.c
index ffd559302b870e8bf12ceef4ec07687cc3ec3f14..3b88ffdc2afcb0a3e92f0723cc2600528386ee5e 100755 (executable)
--- a/src/network_signal.c
+++ b/src/network_signal.c
@@ -175,6 +175,10 @@ static wlan_security_mode_type_e __net_get_wlan_sec_mode(int security)
                return WLAN_SEC_MODE_WPA2_PSK;
        case 5:
                return WLAN_SEC_MODE_IEEE8021X;
+       case 6:
+               return WLAN_SEC_MODE_WPA_FT_PSK;
+       case 7:
+               return WLAN_SEC_MODE_SAE;
        default:
                return WLAN_SEC_MODE_NONE;
        }

diff --git a/src/wifi_ap.c b/src/wifi_ap.c
index c4f3b8505308b20b35f6668cda9c9580153747a8..c8f0d45ef6d88ab0c0165113673d1c3b9a3e6d72 100755 (executable)
--- a/src/wifi_ap.c
+++ b/src/wifi_ap.c
@@ -87,16 +87,19 @@ static char *__wifi_create_profile_name(const char *ssid,
        case WLAN_SEC_MODE_WEP:
                g_sec = "wep";
                break;
+       case WLAN_SEC_MODE_IEEE8021X:
+               g_sec = "ieee8021x";
+               break;
        case WLAN_SEC_MODE_WPA_PSK:
        case WLAN_SEC_MODE_WPA2_PSK:
                g_sec = "psk";
                break;
-       case WLAN_SEC_MODE_IEEE8021X:
-               g_sec = "ieee8021x";
-               break;
        case WLAN_SEC_MODE_WPA_FT_PSK:
                g_sec = "ft_psk";
                break;
+       case WLAN_SEC_MODE_SAE:
+               g_sec = "sae";
+               break;
        default:
                WIFI_LOG(WIFI_ERROR, "Invalid security type");
                return NULL;
@@ -1678,6 +1681,9 @@ EXPORT_API int wifi_manager_ap_get_security_type(wifi_manager_ap_h ap,
        case WLAN_SEC_MODE_WPA_FT_PSK:
                *type = WIFI_MANAGER_SECURITY_TYPE_WPA_FT_PSK;
                break;
+       case WLAN_SEC_MODE_SAE:
+               *type = WIFI_MANAGER_SECURITY_TYPE_SAE;
+               break;
        default:
                /* __NETWORK_CAPI_FUNC_EXIT__; */
                return WIFI_MANAGER_ERROR_OPERATION_FAILED;
@@ -1724,6 +1730,9 @@ EXPORT_API int wifi_manager_ap_set_security_type(wifi_manager_ap_h ap,
        case WIFI_MANAGER_SECURITY_TYPE_WPA_FT_PSK:
                profile_info->security_info.sec_mode = WLAN_SEC_MODE_WPA_FT_PSK;
                break;
+       case WIFI_MANAGER_SECURITY_TYPE_SAE:
+               profile_info->security_info.sec_mode = WLAN_SEC_MODE_SAE;
+               break;
        default:
                __NETWORK_CAPI_FUNC_EXIT__;
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
@@ -1854,6 +1863,7 @@ EXPORT_API int wifi_manager_ap_is_passphrase_required(wifi_manager_ap_h ap,
        case WLAN_SEC_MODE_WPA_PSK:
        case WLAN_SEC_MODE_WPA2_PSK:
        case WLAN_SEC_MODE_WPA_FT_PSK:
+       case WLAN_SEC_MODE_SAE:
                *required = true;
                break;
        default:
@@ -1893,6 +1903,10 @@ EXPORT_API int wifi_manager_ap_set_passphrase(wifi_manager_ap_h ap, const char *
                g_strlcpy(profile_info->security_info.authentication.psk.pskKey,
                                passphrase, NET_WLAN_MAX_PSK_PASSPHRASE_LEN+1);
                break;
+       case WLAN_SEC_MODE_SAE:
+               g_strlcpy(profile_info->security_info.authentication.sae.saeKey,
+                               passphrase, NET_WLAN_MAX_SAE_PASSPHRASE_LEN+1);
+               break;
        case WLAN_SEC_MODE_NONE:
        case WLAN_SEC_MODE_IEEE8021X:
        default:

diff --git a/src/wifi_internal.c b/src/wifi_internal.c
index efa1c57c2ce63dd47ef657f27eb08315ed07e932..47a1776e4fe2fbb935ddf52071c32c8c834262a2 100755 (executable)
--- a/src/wifi_internal.c
+++ b/src/wifi_internal.c
@@ -31,6 +31,7 @@ static gboolean multi_scan_type[WIFI_MULTI_SCAN_MAX] = {0, };
 #define WIFI_SECURITY_WEP                      "wep"
 #define WIFI_SECURITY_WPA_PSK                  "psk"
 #define WIFI_SECURITY_WPA_FT_PSK               "ft_psk"
+#define WIFI_SECURITY_SAE                      "sae"
 #define WIFI_SECURITY_EAP                      "ieee8021x"
 
 static __thread GSList *wifi_manager_handle_list = NULL;
@@ -213,6 +214,9 @@ static gchar *__wifi_security_type_to_string(wifi_manager_security_type_e securi
        case WIFI_MANAGER_SECURITY_TYPE_WPA2_PSK:
                return WIFI_SECURITY_WPA_PSK;
 
+       case WIFI_MANAGER_SECURITY_TYPE_SAE:
+               return WIFI_SECURITY_SAE;
+
        case WIFI_MANAGER_SECURITY_TYPE_WPA_FT_PSK:
                return WIFI_SECURITY_WPA_FT_PSK;
 
@@ -471,6 +475,9 @@ static void __update_netlink_scan_profile_iterator(GSList *bss_list)
                        profile->security_info.sec_mode = WLAN_SEC_MODE_WPA2_PSK;
                        break;
                case 4:
+                       profile->security_info.sec_mode = WLAN_SEC_MODE_SAE;
+                       break;
+               case 5:
                        profile->security_info.sec_mode = WLAN_SEC_MODE_IEEE8021X;
                        break;
                default:
@@ -1893,6 +1900,9 @@ int _wifi_get_hidden_aps(wifi_manager_h wifi, const char *essid,
                case WLAN_SEC_MODE_WPA_FT_PSK:
                        type = WIFI_MANAGER_SECURITY_TYPE_WPA_PSK;
                        break;
+               case WLAN_SEC_MODE_SAE:
+                       type = WIFI_MANAGER_SECURITY_TYPE_SAE;
+                       break;
                }
                if (prof_info->is_hidden == TRUE) {
                        if (type == sec_type) {
@@ -1928,6 +1938,10 @@ int _wifi_get_hidden_aps(wifi_manager_h wifi, const char *essid,
                g_strlcpy(profile_info->security_info.authentication.psk.pskKey,
                                passphrase, NET_WLAN_MAX_PSK_PASSPHRASE_LEN+1);
                break;
+       case WLAN_SEC_MODE_SAE:
+               g_strlcpy(profile_info->security_info.authentication.sae.saeKey,
+                               passphrase, NET_WLAN_MAX_SAE_PASSPHRASE_LEN+1);
+               break;
        case WLAN_SEC_MODE_NONE:
                break;
        case WLAN_SEC_MODE_IEEE8021X:

diff --git a/test/wifi_manager_test.c b/test/wifi_manager_test.c
index baae119c5348f6ba36e2e3dbedee2d17079b96d1..1beba739b6aea0c7027d6ab6b0b8a6eb18a88dfc 100755 (executable)
--- a/test/wifi_manager_test.c
+++ b/test/wifi_manager_test.c
@@ -1459,6 +1459,7 @@ static bool __test_found_specific_ap_callback(wifi_manager_ap_h ap, void *user_d
        case WIFI_MANAGER_SECURITY_TYPE_WEP:
        case WIFI_MANAGER_SECURITY_TYPE_WPA_PSK:
        case WIFI_MANAGER_SECURITY_TYPE_WPA2_PSK:
+       case WIFI_MANAGER_SECURITY_TYPE_SAE:
                {
                        char passphrase[100];
                        printf("Input passphrase for %s : ", ap_name);

diff --git a/tool/wifi_mgr_tool.c b/tool/wifi_mgr_tool.c
index 0b33a9287967f77d9cebd0d90702b9f038740b36..cfcc767327a260d60c0f5bf58238dfb21a4e09f3 100755 (executable)
--- a/tool/wifi_mgr_tool.c
+++ b/tool/wifi_mgr_tool.c
@@ -496,6 +496,8 @@ const char *test_wifi_mgr_sec_type_to_string(wifi_manager_security_type_e type)
                return "EAP";
        case WIFI_MANAGER_SECURITY_TYPE_WPA_FT_PSK:
                return "FT_PSK";
+       case WIFI_MANAGER_SECURITY_TYPE_SAE:
+               return "WPA3";
        }
 
        return "Unknown";