D-Bus: Add GroupMgmt entry into the interface Capabilities dict

This can be used to determine whether the driver supports PMF and if so,
with which group management cipher suites. In addition, add the missing
pairwise and group cipher suite values to the documentation while adding
this new entry there as well.

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/doc/dbus.doxygen b/doc/dbus.doxygen
index a4648b81b3cd9a946fd79ffb3464ffbaa10d16cc..8d245459ac3c2205724b9adb20f2956aea1482e5 100644 (file)
--- a/doc/dbus.doxygen
+++ b/doc/dbus.doxygen
@@ -625,8 +625,9 @@ fi.w1.wpa_supplicant1.CreateInterface.
        <p>Capabilities of the interface. Dictionary contains following entries:</p>
        <table>
          <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>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>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>

diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c
index 87581c9008487f8c3a6070b00e5b232b07c675f4..a6548ba21d72ca6cc2a170fd14eb5bf5bba3068a 100644 (file)
--- a/wpa_supplicant/dbus/dbus_new_handlers.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers.c
@@ -2492,6 +2492,28 @@ dbus_bool_t wpas_dbus_getter_capabilities(
                        goto nomem;
        }
 
+       if (!wpa_dbus_dict_begin_string_array(&iter_dict, "GroupMgmt",
+                                             &iter_dict_entry,
+                                             &iter_dict_val,
+                                             &iter_array) ||
+           (res == 0 && (capa.enc & WPA_DRIVER_CAPA_ENC_BIP) &&
+            !wpa_dbus_dict_string_array_add_element(
+                    &iter_array, "aes-128-cmac")) ||
+           (res == 0 && (capa.enc & WPA_DRIVER_CAPA_ENC_BIP_GMAC_128) &&
+            !wpa_dbus_dict_string_array_add_element(
+                    &iter_array, "bip-gmac-128")) ||
+           (res == 0 && (capa.enc & WPA_DRIVER_CAPA_ENC_BIP_GMAC_256) &&
+            !wpa_dbus_dict_string_array_add_element(
+                    &iter_array, "bip-gmac-256")) ||
+           (res == 0 && (capa.enc & WPA_DRIVER_CAPA_ENC_BIP_CMAC_256) &&
+            !wpa_dbus_dict_string_array_add_element(
+                    &iter_array, "bip-cmac-256")) ||
+           !wpa_dbus_dict_end_string_array(&iter_dict,
+                                           &iter_dict_entry,
+                                           &iter_dict_val,
+                                           &iter_array))
+               goto nomem;
+
        /***** key management */
        if (res < 0) {
                const char *args[] = {