[PATCH 1/3] hostapd: add wpad-basic-wolfssl variant

[Petr Štetiar]

Add package which provides wpad with WPA-PSK, SAE (WPA3-Personal),
802.11r and 802.11w support.

Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
 include/target.mk                          |  2 +-
 package/network/services/hostapd/Config.in |  2 ++
 package/network/services/hostapd/Makefile  | 20 ++++++++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/include/target.mk b/include/target.mk
index aba477e83b8b..6ed6565bdaa2 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -56,7 +56,7 @@ endif
 DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE))
 
 filter_packages = $(filter-out -% $(patsubst -%,%,$(filter -%,$(1))),$(1))
-extra_packages = $(if $(filter wpad-mini wpad-basic wpad nas,$(1)),iwinfo)
+extra_packages = $(if $(filter wpad-mini wpad-basic wpad-basic-wolfssl wpad nas,$(1)),iwinfo)
 
 define ProfileDefault
   NAME:=
diff --git a/package/network/services/hostapd/Config.in b/package/network/services/hostapd/Config.in
index 81a374c6525a..aa2a4bc41b5b 100644
--- a/package/network/services/hostapd/Config.in
+++ b/package/network/services/hostapd/Config.in
@@ -13,6 +13,7 @@ config WPA_RFKILL_SUPPORT
 		   PACKAGE_wpad-openssl || \
 		   PACKAGE_wpad-wolfssl || \
 		   PACKAGE_wpad-basic || \
+		   PACKAGE_wpad-basic-wolfssl || \
 		   PACKAGE_wpad-mini || \
 		   PACKAGE_wpad-mesh-openssl || \
 		   PACKAGE_wpad-mesh-wolfssl
@@ -32,6 +33,7 @@ config WPA_MSG_MIN_PRIORITY
 		   PACKAGE_wpad-openssl || \
 		   PACKAGE_wpad-wolfssl || \
 		   PACKAGE_wpad-basic || \
+		   PACKAGE_wpad-basic-wolfssl || \
 		   PACKAGE_wpad-mini || \
 		   PACKAGE_wpad-mesh-openssl || \
 		   PACKAGE_wpad-mesh-wolfssl
diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
index d754f19857ea..df1a80d3dabb 100644
--- a/package/network/services/hostapd/Makefile
+++ b/package/network/services/hostapd/Makefile
@@ -109,6 +109,13 @@ ifeq ($(LOCAL_VARIANT),full)
   endif
 endif
 
+ifeq ($(LOCAL_VARIANT),basic)
+  ifeq ($(SSL_VARIANT),wolfssl)
+    DRIVER_MAKEOPTS += CONFIG_TLS=wolfssl CONFIG_SAE=y
+    TARGET_LDFLAGS += -lwolfssl
+  endif
+endif
+
 ifneq ($(LOCAL_TYPE),hostapd)
   ifeq ($(LOCAL_VARIANT),mesh)
     ifeq ($(SSL_VARIANT),openssl)
@@ -248,6 +255,17 @@ define Package/wpad-basic/description
  This package contains a basic IEEE 802.1x/WPA Authenticator and Supplicant with WPA-PSK, 802.11r and 802.11w support.
 endef
 
+define Package/wpad-basic-wolfssl
+$(call Package/wpad/Default,$(1))
+  TITLE+= (WPA3-Personal, 11r and 11w)
+  VARIANT:=wpad-basic-wolfssl
+  DEPENDS+=+libwolfssl
+endef
+
+define Package/wpad-basic-wolfssl/description
+ This package contains a basic IEEE 802.1x/WPA Authenticator and Supplicant with WPA-PSK, SAE (WPA3-Personal), 802.11r and 802.11w support.
+endef
+
 define Package/wpad-mini
 $(call Package/wpad/Default,$(1))
   TITLE+= (WPA-PSK only)
@@ -567,6 +585,7 @@ define Package/wpad/install
 	$(LN) wpad $(1)/usr/sbin/wpa_supplicant
 endef
 Package/wpad-basic/install = $(Package/wpad/install)
+Package/wpad-basic-wolfssl/install = $(Package/wpad/install)
 Package/wpad-mini/install = $(Package/wpad/install)
 Package/wpad-openssl/install = $(Package/wpad/install)
 Package/wpad-wolfssl/install = $(Package/wpad/install)
@@ -622,6 +641,7 @@ $(eval $(call BuildPackage,wpad))
 $(eval $(call BuildPackage,wpad-mesh-openssl))
 $(eval $(call BuildPackage,wpad-mesh-wolfssl))
 $(eval $(call BuildPackage,wpad-basic))
+$(eval $(call BuildPackage,wpad-basic-wolfssl))
 $(eval $(call BuildPackage,wpad-mini))
 $(eval $(call BuildPackage,wpad-openssl))
 $(eval $(call BuildPackage,wpad-wolfssl))