Expose availability of SHA384 and FT on D-Bus

0001-dbus-Expose-availability-of-FT-on-D-Bus.patch

@@ -0,0 +1,41 @@
+From eb7e74793139f2d0c9bf63f5eb9c839fdaf95b37 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Sun, 7 Oct 2018 16:57:10 +0200
+Subject: [PATCH 1/2] dbus: Expose availability of FT on D-Bus
+
+This lets us know whether we can attempt to use FT-PSK, FT-EAP,
+FT-EAP-SHA384, FT-FILS-SHA256 or FT-FILS-SHA384.
+
+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 c81c0855d..fa461c357 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[8] = { NULL, NULL, NULL, NULL, NULL, NULL,
+-					NULL, NULL };
++	const char *capabilities[9] = { NULL, NULL, NULL, NULL, NULL, NULL,
++					NULL, NULL, NULL };
+ 	size_t num_items = 0;
+ #ifdef CONFIG_FILS
+ 	struct wpa_global *global = user_data;
+@@ -1020,6 +1020,9 @@ dbus_bool_t wpas_dbus_getter_global_capabilities(
+ 	if (fils_sk_pfs_supported)
+ 		capabilities[num_items++] = "fils_sk_pfs";
+ #endif /* CONFIG_FILS */
++#ifdef CONFIG_IEEE80211R
++	capabilities[num_items++] = "ft";
++#endif /* CONFIG_IEEE80211R */
+ 
+ 	return wpas_dbus_simple_array_property_getter(iter,
+ 						      DBUS_TYPE_STRING,
+-- 
+2.19.1
+

0002-dbus-Expose-availability-of-SHA384-on-D-Bus.patch

@@ -0,0 +1,40 @@
+From d7591aab85fda730214094e298abc65dcd5cd349 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Sun, 7 Oct 2018 16:57:27 +0200
+Subject: [PATCH 2/2] dbus: Expose availability of SHA384 on D-Bus
+
+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(-)
+
+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,
+-- 
+2.19.1
+

wpa_supplicant.spec

@@ -7,7 +7,7 @@ Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
 Epoch: 1
 Version: 2.6
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: BSD
 Group: System Environment/Base
 Source0: http://w1.fi/releases/%{name}-%{version}%{rcver}%{snapshot}.tar.gz
@@ -108,6 +108,12 @@ Patch63: rh1570903-nl80211-Fix-NL80211_ATTR_SMPS_MODE-encoding.patch
 # Unauthenticated EAPOL-Key decryption in wpa_supplicant (CVE-2018-14526)
 Patch64: https://w1.fi/security/2018-1/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch
 
+# dbus: Expose availability of SHA384 on D-Bus
+Patch65: https://w1.fi/cgit/hostap/patch/?id=d7591aa#/0002-dbus-Expose-availability-of-SHA384-on-D-Bus.patch
+
+# dbus: Expose availability of FT on D-Bus
+Patch66: https://w1.fi/cgit/hostap/patch/?id=eb7e747#/0001-dbus-Expose-availability-of-FT-on-D-Bus.patch
+
 URL: http://w1.fi/wpa_supplicant/
 
 %if %{build_gui}
@@ -309,6 +315,9 @@ chmod -R 0644 %{name}/examples/*.py
 %endif
 
 %changelog
+* Wed Aug 15 2018 Lubomir Rintel <lkundrak@v3.sk> - 1:2.6-20
+- Expose availability of SHA384 and FT on D-Bus
+
 * Wed Aug 15 2018 Lubomir Rintel <lkundrak@v3.sk> - 1:2.6-19
 - Drop the broken Pmf D-Bus property patch