From: Jaehyun Kim <jeik01.kim@samsung.com>
Date: Wed, 13 Sep 2023 09:27:21 +0000 (+0000)
Subject: Merge "Add some missing code for SAE support" into tizen
X-Git-Tag: accepted/tizen/unified/20230913.172628~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5b48a4bfc100eab55984e53705322afb7ce20e0e;hp=eca8f9f7cdf7bc437c6f7794259712feb975bdd6;p=platform%2Fupstream%2Fconnman.git

Merge "Add some missing code for SAE support" into tizen
---

diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c
index c144a4f..c268703 100755
--- a/gsupplicant/supplicant.c
+++ b/gsupplicant/supplicant.c
@@ -2454,9 +2454,16 @@ static void merge_network(GSupplicantNetwork *network)
 		g_string_append_printf(str, "_mesh");
 #endif
 
+#if defined TIZEN_EXT
+	if (g_strcmp0(key_mgmt, "WPA-PSK") == 0)
+		g_string_append_printf(str, "_psk");
+	else if (g_strcmp0(key_mgmt, "SAE") == 0)
+		g_string_append_printf(str, "_sae");
+#else
 	if ((g_strcmp0(key_mgmt, "WPA-PSK") == 0) ||
 	    (g_strcmp0(key_mgmt, "SAE") == 0))
 		g_string_append_printf(str, "_psk");
+#endif
 #if defined TIZEN_EXT
 	else if (g_strcmp0(key_mgmt, "WPA-EAP") == 0)
 		g_string_append_printf(str, "_ieee8021x");
@@ -7374,12 +7381,6 @@ static void add_network_security_net_access_key(DBusMessageIter *dict, GSupplica
 static void add_network_ieee80211w(DBusMessageIter *dict, GSupplicantSSID *ssid,
 				   GSupplicantMfpOptions ieee80211w)
 {
-#if defined TIZEN_EXT
-	if (ssid->security != G_SUPPLICANT_SECURITY_OWE
-			&& ssid->security != G_SUPPLICANT_SECURITY_PSK_SHA256
-			&& ssid->security != G_SUPPLICANT_SECURITY_DPP)
-		return;
-#endif
 	supplicant_dbus_dict_append_basic(dict, "ieee80211w", DBUS_TYPE_UINT32,
 					  &ieee80211w);
 }
@@ -7459,6 +7460,8 @@ static void add_network_security(DBusMessageIter *dict, GSupplicantSSID *ssid)
 			add_network_ieee80211w(dict, ssid, ieee80211w);
 		}
 		add_network_security_psk(dict, ssid);
+		add_network_security_ciphers(dict, ssid);
+		add_network_security_proto(dict, ssid);
 		break;
 	case G_SUPPLICANT_SECURITY_OWE:
 		key_mgmt = "OWE";