diff options
| author | Witold Sowa <witold.sowa@gmail.com> | 2010-04-11 21:37:28 +0300 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2010-04-11 21:37:28 +0300 |
| commit | c56ce48a6f33f4c283e6aeb02c7e816c1c9a0ac8 (patch) | |
| tree | c3988c17e6fbd5d4f588cc0bb7970203849267be /wpa_supplicant/dbus | |
| parent | 0544b242481001de7085fe24741a6f4fee192fe6 (diff) | |
| download | external_wpa_supplicant_8_ti-c56ce48a6f33f4c283e6aeb02c7e816c1c9a0ac8.zip external_wpa_supplicant_8_ti-c56ce48a6f33f4c283e6aeb02c7e816c1c9a0ac8.tar.gz external_wpa_supplicant_8_ti-c56ce48a6f33f4c283e6aeb02c7e816c1c9a0ac8.tar.bz2 | |
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.
Diffstat (limited to 'wpa_supplicant/dbus')
| -rw-r--r-- | wpa_supplicant/dbus/dbus_new_handlers.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c index 3e924dc..83691de 100644 --- 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) { |