From 61e35733f85e75b47d6f58a8a2dbf9505fcd900c Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 27 Sep 2022 15:57:21 +0000
Subject: [PATCH] hostapd: Enable support for 802.11ax

This patch pulls the default configuration from upstream which is making
this change slightly more verbose than it has to be.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/hostapd/config | 32 ++++++++++++++++++++++++++++----
 lfs/hostapd           |  2 +-
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/config/hostapd/config b/config/hostapd/config
index d3383afde2..c2cc9f4f28 100644
--- a/config/hostapd/config
+++ b/config/hostapd/config
@@ -156,10 +156,20 @@ CONFIG_RSN_PREAUTH=y
 CONFIG_IEEE80211AC=y
 
 # IEEE 802.11ax HE support
+CONFIG_IEEE80211AX=y
+
+# IEEE 802.11be EHT support
+# CONFIG_IEEE80211AX is mandatory for setting CONFIG_IEEE80211BE.
 # Note: This is experimental and work in progress. The definitions are still
 # subject to change and this should not be expected to interoperate with the
-# final IEEE 802.11ax version.
-CONFIG_IEEE80211AX=y
+# final IEEE 802.11be version.
+#CONFIG_IEEE80211BE=y
+
+# Simultaneous Authentication of Equals (SAE), WPA3-Personal
+CONFIG_SAE=y
+
+# SAE Public Key, WPA3-Personal
+CONFIG_SAE_PK=y
 
 # Remove debugging code that is printing out debug messages to stdout.
 # This can be used to reduce the size of the hostapd considerably if debugging
@@ -346,7 +356,7 @@ CONFIG_TLS=openssl
 # * ath10k
 #
 # For more details refer to:
-# http://wireless.kernel.org/en/users/Documentation/acs
+# https://wireless.wiki.kernel.org/en/users/documentation/acs
 #
 CONFIG_ACS=y
 
@@ -396,6 +406,20 @@ CONFIG_AIRTIME_POLICY=y
 # that functionality is subject to be removed in the future.
 #CONFIG_NO_TKIP=y
 
+# Pre-Association Security Negotiation (PASN)
+# Experimental implementation based on IEEE P802.11z/D2.6 and the protocol
+# design is still subject to change. As such, this should not yet be enabled in
+# production use.
+# This requires CONFIG_IEEE80211W=y to be enabled, too.
+#CONFIG_PASN=y
+
+# Device Provisioning Protocol (DPP) (also known as Wi-Fi Easy Connect)
+CONFIG_DPP=y
+# DPP version 2 support
+CONFIG_DPP2=y
+# DPP version 3 support (experimental and still changing; do not enable for
+# production use)
+#CONFIG_DPP3=y
+
 # Manually added options
-CONFIG_SAE=y
 CONFIG_IEEE80211W=y
diff --git a/lfs/hostapd b/lfs/hostapd
index dee60f7d95..c5631e58cb 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 60
+PAK_VER    = 61
 
 DEPS       =
 
-- 
2.39.5