diff mbox series

DBus: add "sae" to interface key_mgmt capabilities

Message ID 20200228235047.56524-1-briannorris@chromium.org
State Accepted
Headers show
Series DBus: add "sae" to interface key_mgmt capabilities | expand

Commit Message

Brian Norris Feb. 28, 2020, 11:50 p.m. UTC 
Present when the driver supports SAE and it's enabled in wpa_supplicant.

Signed-off-by: Brian Norris <briannorris@chromium.org>
---
 doc/dbus.doxygen                        | 2 +-
 wpa_supplicant/dbus/dbus_new_handlers.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

Comments

Jouni Malinen Feb. 29, 2020, 7:24 p.m. UTC | #1 
On Fri, Feb 28, 2020 at 03:50:47PM -0800, Brian Norris wrote:
> Present when the driver supports SAE and it's enabled in wpa_supplicant.

Thanks, applied.
diff mbox series

Patch

diff --git a/doc/dbus.doxygen b/doc/dbus.doxygen
index b2b4389c9158..a2e5de26227b 100644
--- a/doc/dbus.doxygen
+++ b/doc/dbus.doxygen
@@ -651,7 +651,7 @@  fi.w1.wpa_supplicant1.CreateInterface.
 	  <tr><td>Pairwise</td><td>as</td><td>Possible array elements: "ccmp-256", "gcmp-256", "ccmp", "gcmp", "tkip", "none"</td>
 	  <tr><td>Group</td><td>as</td><td>Possible array elements: "ccmp-256", "gcmp-256", "ccmp", "gcmp", "tkip", "wep104", "wep40"</td>
 	  <tr><td>GroupMgmt</td><td>as</td><td>Possible array elements: "aes-128-cmac", "bip-gmac-128", "bip-gmac-256", "bip-cmac-256"</td>
-	  <tr><td>KeyMgmt</td><td>as</td><td>Possible array elements: "wpa-psk", "wpa-ft-psk", "wpa-psk-sha256", "wpa-eap", "wpa-ft-eap", "wpa-eap-sha256", "ieee8021x", "wpa-none", "wps", "none"</td>
+	  <tr><td>KeyMgmt</td><td>as</td><td>Possible array elements: "wpa-psk", "wpa-ft-psk", "wpa-psk-sha256", "wpa-eap", "wpa-ft-eap", "wpa-eap-sha256", "sae", "ieee8021x", "wpa-none", "wps", "none"</td>
 	  <tr><td>Protocol</td><td>as</td><td>Possible array elements: "rsn", "wpa"</td>
 	  <tr><td>AuthAlg</td><td>as</td><td>Possible array elements: "open", "shared", "leap"</td>
 	  <tr><td>Scan</td><td>as</td><td>Possible array elements: "active", "passive", "ssid"</td>
diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c
index 4b6dabcc9b55..4b2ca1a156d4 100644
--- a/wpa_supplicant/dbus/dbus_new_handlers.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers.c
@@ -2793,6 +2793,13 @@  dbus_bool_t wpas_dbus_getter_capabilities(
 			goto nomem;
 #endif /* CONFIG_WPS */
 
+#ifdef CONFIG_SAE
+		if ((capa.key_mgmt & WPA_DRIVER_CAPA_KEY_MGMT_SAE) &&
+		     !wpa_dbus_dict_string_array_add_element(&iter_array,
+							     "sae"))
+			goto nomem;
+#endif
+
 		if (!wpa_dbus_dict_end_string_array(&iter_dict,
 						    &iter_dict_entry,
 						    &iter_dict_val,