|
 |
919688 |
From 7800725afb27397f7d6033d4969e2aeb61af4737 Mon Sep 17 00:00:00 2001
|
|
|
919688 |
Message-Id: <7800725afb27397f7d6033d4969e2aeb61af4737.1602780273.git.davide.caratti@gmail.com>
|
|
|
919688 |
From: Beniamino Galvani <bgalvani@redhat.com>
|
|
|
919688 |
Date: Sun, 13 Oct 2019 15:18:54 +0200
|
|
|
919688 |
Subject: [PATCH] dbus: Export OWE capability and OWE BSS key_mgmt
|
|
|
919688 |
|
|
|
919688 |
Export a new 'owe' capability to indicate that wpa_supplicant was
|
|
|
919688 |
built with OWE support and accepts 'key_mgmt=OWE'. Also, support 'owe'
|
|
|
919688 |
in the array of BSS' available key managements.
|
|
|
919688 |
|
|
|
919688 |
Signed-off-by: Beniamino Galvani <bgalvani@redhat.com>
|
|
|
919688 |
---
|
|
|
919688 |
wpa_supplicant/dbus/dbus_new_handlers.c | 12 +++++++++---
|
|
|
919688 |
1 file changed, 9 insertions(+), 3 deletions(-)
|
|
|
919688 |
|
|
|
919688 |
diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c
|
|
|
919688 |
index d2c84e5c5..1206c3cde 100644
|
|
|
919688 |
--- a/wpa_supplicant/dbus/dbus_new_handlers.c
|
|
|
919688 |
+++ b/wpa_supplicant/dbus/dbus_new_handlers.c
|
|
|
919688 |
@@ -984,8 +984,7 @@ dbus_bool_t wpas_dbus_getter_global_capabilities(
|
|
|
919688 |
const struct wpa_dbus_property_desc *property_desc,
|
|
|
919688 |
DBusMessageIter *iter, DBusError *error, void *user_data)
|
|
|
919688 |
{
|
|
|
919688 |
- const char *capabilities[10] = { NULL, NULL, NULL, NULL, NULL, NULL,
|
|
|
919688 |
- NULL, NULL, NULL, NULL };
|
|
|
919688 |
+ const char *capabilities[11];
|
|
|
919688 |
size_t num_items = 0;
|
|
|
919688 |
#ifdef CONFIG_FILS
|
|
|
919688 |
struct wpa_global *global = user_data;
|
|
|
919688 |
@@ -1028,6 +1027,9 @@ dbus_bool_t wpas_dbus_getter_global_capabilities(
|
|
|
919688 |
#ifdef CONFIG_SHA384
|
|
|
919688 |
capabilities[num_items++] = "sha384";
|
|
|
919688 |
#endif /* CONFIG_SHA384 */
|
|
|
919688 |
+#ifdef CONFIG_OWE
|
|
|
919688 |
+ capabilities[num_items++] = "owe";
|
|
|
919688 |
+#endif /* CONFIG_OWE */
|
|
|
919688 |
|
|
|
919688 |
return wpas_dbus_simple_array_property_getter(iter,
|
|
|
919688 |
DBUS_TYPE_STRING,
|
|
|
919688 |
@@ -4491,7 +4493,7 @@ static dbus_bool_t wpas_dbus_get_bss_security_prop(
|
|
|
919688 |
DBusMessageIter iter_dict, variant_iter;
|
|
|
919688 |
const char *group;
|
|
|
919688 |
const char *pairwise[5]; /* max 5 pairwise ciphers is supported */
|
|
|
919688 |
- const char *key_mgmt[15]; /* max 15 key managements may be supported */
|
|
|
919688 |
+ const char *key_mgmt[16]; /* max 16 key managements may be supported */
|
|
|
919688 |
int n;
|
|
|
919688 |
|
|
|
919688 |
if (!dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT,
|
|
|
919688 |
@@ -4544,6 +4546,10 @@ static dbus_bool_t wpas_dbus_get_bss_security_prop(
|
|
|
919688 |
if (ie_data->key_mgmt & WPA_KEY_MGMT_FT_SAE)
|
|
|
919688 |
key_mgmt[n++] = "ft-sae";
|
|
|
919688 |
#endif /* CONFIG_SAE */
|
|
|
919688 |
+#ifdef CONFIG_OWE
|
|
|
919688 |
+ if (ie_data->key_mgmt & WPA_KEY_MGMT_OWE)
|
|
|
919688 |
+ key_mgmt[n++] = "owe";
|
|
|
919688 |
+#endif /* CONFIG_OWE */
|
|
|
919688 |
if (ie_data->key_mgmt & WPA_KEY_MGMT_NONE)
|
|
|
919688 |
key_mgmt[n++] = "wpa-none";
|
|
|
919688 |
|
|
|
919688 |
--
|
|
|
919688 |
2.26.2
|
|
|
919688 |
|