dbus: Add new KeyMgmt interface capabilities

Add "wpa-ft-psk", "wpa-psk-sha256", "wpa-ft-eap" and "wpa-eap-sha256"
possible KeyMgmt values of interface capabilities to fit values in
BSS RSN options dictionary.

diff --git a/doc/dbus.doxygen b/doc/dbus.doxygen
index 17a3d50..eeea200 100644 (file)
--- a/doc/dbus.doxygen
+++ b/doc/dbus.doxygen
@@ -328,7 +328,7 @@ fi.w1.wpa_supplicant1.CreateInterface.
          <tr><th>Key</th><th>Value type</th><th>Description</th>
          <tr><td>Pairwise</td><td>as</td><td>Possible array elements: "ccmp", "tkip", "none"</td>
          <tr><td>Group</td><td>as</td><td>Possible array elements: "ccmp", "tkip", "wep104", "wep40"</td>
-         <tr><td>KeyMgmt</td><td>as</td><td>Possible array elements: "wpa-psk", "wpa-eap", "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", "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 3e924dc..83691de 100644 (file)
--- a/wpa_supplicant/dbus/dbus_new_handlers.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers.c
@@ -1814,6 +1814,18 @@ DBusMessage * wpas_dbus_getter_capabilities(DBusMessage *message,
                        if (!wpa_dbus_dict_string_array_add_element(
                                    &iter_array, "wpa-eap"))
                                goto nomem;
+
+                       if (capa.key_mgmt & WPA_DRIVER_CAPA_KEY_MGMT_FT)
+                               if (!wpa_dbus_dict_string_array_add_element(
+                                           &iter_array, "wpa-ft-eap"))
+                                       goto nomem;
+
+/* TODO: Ensure that driver actually supports sha256 encryption. */
+#ifdef CONFIG_IEEE80211W
+                       if (!wpa_dbus_dict_string_array_add_element(
+                                   &iter_array, "wpa-eap-sha256"))
+                               goto nomem;
+#endif /* CONFIG_IEEE80211W */
                }
 
                if (capa.key_mgmt & (WPA_DRIVER_CAPA_KEY_MGMT_WPA_PSK |
@@ -1821,6 +1833,18 @@ DBusMessage * wpas_dbus_getter_capabilities(DBusMessage *message,
                        if (!wpa_dbus_dict_string_array_add_element(
                                    &iter_array, "wpa-psk"))
                                goto nomem;
+
+                       if (capa.key_mgmt & WPA_DRIVER_CAPA_KEY_MGMT_FT_PSK)
+                               if (!wpa_dbus_dict_string_array_add_element(
+                                           &iter_array, "wpa-ft-psk"))
+                                       goto nomem;
+
+/* TODO: Ensure that driver actually supports sha256 encryption. */
+#ifdef CONFIG_IEEE80211W
+                       if (!wpa_dbus_dict_string_array_add_element(
+                                   &iter_array, "wpa-psk-sha256"))
+                               goto nomem;
+#endif /* CONFIG_IEEE80211W */
                }
 
                if (capa.key_mgmt & WPA_DRIVER_CAPA_KEY_MGMT_WPA_NONE) {