hostapd: add wpad-basic-wolfssl variant

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

Signed-off-by: Petr Štetiar <ynezz@true.cz>
[adapt to recent changes, add dependency for WPA_WOLFSSL config]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/include/target.mk b/include/target.mk
index aba477e83b8b00f2d9f2782892fc3b896b173f59..6ed6565bdaa24f11dd83e6d084896646b9b8e4ea 100644 (file)
--- 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 81a374c6525ad0d4b8bf2fd54312a9871fe3dd46..b211877fb3cd526f1594d76d9fa6878fda60147a 100644 (file)
--- 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
@@ -49,6 +51,7 @@ config WPA_WOLFSSL
        bool
        default PACKAGE_wpa-supplicant-wolfssl ||\
                PACKAGE_wpad-wolfssl ||\
+               PACKAGE_wpad-basic-wolfssl || \
                PACKAGE_wpad-mesh-wolfssl ||\
                PACKAGE_eapol-test-wolfssl
        select WOLFSSL_HAS_AES_CCM

diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
index 44312db590ab5a475be4b6f9b09cde5306edb304..b3e93cb77002565a3531874cbb87e567c2de6c74 100644 (file)
--- a/package/network/services/hostapd/Makefile
+++ b/package/network/services/hostapd/Makefile
@@ -250,6 +250,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+= (wolfSSL, 11r, 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)
@@ -575,6 +586,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)
@@ -630,6 +642,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))