| Message ID | 20181007145727.55590-1-lkundrak@v3.sk |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [RESEND] dbus: expose availability of SHA384 on D-Bus | expand |
On Sun, 2018-10-07 at 16:57 +0200, Lubomir Rintel wrote: > This lets us know whether we can attempt to use FT-EAP-SHA384. LGTM > Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> > --- > wpa_supplicant/dbus/dbus_new_handlers.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c > b/wpa_supplicant/dbus/dbus_new_handlers.c > index fa461c357..94773b329 100644 > --- a/wpa_supplicant/dbus/dbus_new_handlers.c > +++ b/wpa_supplicant/dbus/dbus_new_handlers.c > @@ -980,8 +980,8 @@ dbus_bool_t wpas_dbus_getter_global_capabilities( > const struct wpa_dbus_property_desc *property_desc, > DBusMessageIter *iter, DBusError *error, void *user_data) > { > - const char *capabilities[9] = { NULL, NULL, NULL, NULL, > NULL, NULL, > - NULL, NULL, NULL }; > + const char *capabilities[10] = { NULL, NULL, NULL, NULL, > NULL, NULL, > + NULL, NULL, NULL, NULL }; > size_t num_items = 0; > #ifdef CONFIG_FILS > struct wpa_global *global = user_data; > @@ -1023,6 +1023,9 @@ dbus_bool_t > wpas_dbus_getter_global_capabilities( > #ifdef CONFIG_IEEE80211R > capabilities[num_items++] = "ft"; > #endif /* CONFIG_IEEE80211R */ > +#ifdef CONFIG_SHA384 > + capabilities[num_items++] = "sha384"; > +#endif /* CONFIG_SHA384 */ > > return wpas_dbus_simple_array_property_getter(iter, > DBUS_TYPE_STRI > NG,
On Sun, Oct 07, 2018 at 04:57:27PM +0200, Lubomir Rintel wrote:
> This lets us know whether we can attempt to use FT-EAP-SHA384.
Thanks, applied.
diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c index fa461c357..94773b329 100644 --- a/wpa_supplicant/dbus/dbus_new_handlers.c +++ b/wpa_supplicant/dbus/dbus_new_handlers.c @@ -980,8 +980,8 @@ dbus_bool_t wpas_dbus_getter_global_capabilities( const struct wpa_dbus_property_desc *property_desc, DBusMessageIter *iter, DBusError *error, void *user_data) { - const char *capabilities[9] = { NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL }; + const char *capabilities[10] = { NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL }; size_t num_items = 0; #ifdef CONFIG_FILS struct wpa_global *global = user_data; @@ -1023,6 +1023,9 @@ dbus_bool_t wpas_dbus_getter_global_capabilities( #ifdef CONFIG_IEEE80211R capabilities[num_items++] = "ft"; #endif /* CONFIG_IEEE80211R */ +#ifdef CONFIG_SHA384 + capabilities[num_items++] = "sha384"; +#endif /* CONFIG_SHA384 */ return wpas_dbus_simple_array_property_getter(iter, DBUS_TYPE_STRING,
This lets us know whether we can attempt to use FT-EAP-SHA384. Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> --- wpa_supplicant/dbus/dbus_new_handlers.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)