DBus: Add "sae" to interface key_mgmt capabilities

This will be present when the driver supports SAE and it's included in
the wpa_supplicant build.

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

diff --git a/doc/dbus.doxygen b/doc/dbus.doxygen
index b2b4389c9158d1344847ffee603ff96c05794e77..a2e5de26227bcacec545b8775ec2f8fb760f1445 100644 (file)
--- 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 55c5dbc99d85f6f8acc3ad6103174ad12be0df50..c842c50e9fbfaf96e97d3da807401b957f8dbd67 100644 (file)
--- a/wpa_supplicant/dbus/dbus_new_handlers.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers.c
@@ -2798,6 +2798,12 @@ 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 /* CONFIG_SAE */
+
                if (!wpa_dbus_dict_end_string_array(&iter_dict,
                                                    &iter_dict_entry,
                                                    &iter_dict_val,