DBus: Add 'owe' to interface Capabilities

Signed-off-by: Brian Norris <briannorris@chromium.org>

diff --git a/doc/dbus.doxygen b/doc/dbus.doxygen
index 06e53b98c2786a05bccb3020a71b961e9618d5d2..8231aac418055ff5c0f1bf8ea698dcea0d55d0cf 100644 (file)
--- a/doc/dbus.doxygen
+++ b/doc/dbus.doxygen
@@ -669,7 +669,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", "sae", "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", "owe", "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 fa9a1a370d442d764d45df57bfa85278ae2d5da2..7ff224ef126a732ebe63b97b894dafeff4073427 100644 (file)
--- a/wpa_supplicant/dbus/dbus_new_handlers.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers.c
@@ -2869,6 +2869,12 @@ dbus_bool_t wpas_dbus_getter_capabilities(
                        goto nomem;
 #endif /* CONFIG_SAE */
 
+#ifdef CONFIG_OWE
+               if ((capa.key_mgmt & WPA_DRIVER_CAPA_KEY_MGMT_OWE) &&
+                   !wpa_dbus_dict_string_array_add_element(&iter_array, "owe"))
+                       goto nomem;
+#endif /* CONFIG_OWE */
+
                if (!wpa_dbus_dict_end_string_array(&iter_dict,
                                                    &iter_dict_entry,
                                                    &iter_dict_val,