From patchwork Tue Aug 4 14:24:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1340890 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=lkHOJecJ; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BLcXN23QHz9sSt for ; Wed, 5 Aug 2020 00:27:16 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=vpvji+QvC9yboINqh2clMtCj1RycnCRdHXsi1cmhQfo=; b=lkHOJecJDXQhzpHKm77dKQRjn3 bdVR6uAQtYPdMTSBVBGebnU4vwYAxppLQCn+3m5gldgrK0r0dHkHfn5hcOoyVkmJq3aFGfL/ph9HP cBNkWiE0B0MirNN9mASXOKsedgAKpkDDn3+OKwy5A1kO/kiyUg0y3YZz1Z58TkBaVW/6S3dmgFUEX a5f8FQZIvNRsv/wOagVOBGM4K/DAiMW6xvc606sr3ZfESXqqONRCk13lnJ+u/9EUUolDL8ibYjKVu 7ErhJmYWGiDwUc4Iaza/riVyYH0aW5altIo/kKbUCFkwAsHkPdFHHLBig+ftNZ/Fu5lbz4Px5mzvv mATAm7pQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k2xst-0005Ci-3x; Tue, 04 Aug 2020 14:25:43 +0000 Received: from mout.kundenserver.de ([217.72.192.73]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k2xsp-0005Bo-L3 for openwrt-devel@lists.openwrt.org; Tue, 04 Aug 2020 14:25:40 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Mj8iJ-1khXHu1AMX-00f8in; Tue, 04 Aug 2020 16:25:27 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH v4 1/2] hostapd: add wpad-basic-wolfssl variant Date: Tue, 4 Aug 2020 16:24:35 +0200 Message-Id: <20200804142436.9092-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:lM8AnCmk8b427CW08wGl9qU3nfrOOarYgENU8upwXTSlFiZ4Ulg m1ywwZzZ6Y7kLJpbMhrAWcdUYC1pjtphYpI8b/9KnGaNglzjwV6jnSRd645aWYDIaDbB4XK g7o9KyRrJQHizfSVgmdrP/LlhFZeaGmo8Nf5cKU5rmdeiY2JcCF5rctedp6VHhIrp2ZYhAO 3lU3yLPgPp8WWMBWuIqwQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:IYA87TlnPhs=:GEFtqVx1/b+2AAN6byVUuA WHp7opnzFKr0jxcl7yPfXuEi5+IzmmnTU5A7zJeD/rmC7HnrMS+TmbL3M2YgXnKOc8Nacwe5X n6bj3k3pETZV50StZ3PEUkI+icFf8ujcXMwZGLs+Xgph4R5K4BWfLZIjJBolUfZ/GuPW/tTFW imrBYHTUD34yboR9mxYmHHELuH/g/DMwAGB+VUpnRux1PkTCFlpBjRuWRvpfu3Scijwd5NCX0 jOGHWiPBP5zfJE6bHbjh9bXTkbtyr0o8q5mx6rDBkI/DfsMA4z4XSeEVlRhEEXldA9fdRiDR1 iBPm0qeoKla5LdZfJ8giFXYxtYI6vhcbFRUE6XwqB9gw6fh/lhAhQPpD73qwih+SB+W4r96J3 LQmemaQYAQBf3zWyPTDkSC1Do6gl6WRYUdC7RSwO/9mXlD3pv6NExD5WhW34AkVf/yG7y2AqG YXhKYH6qj3xcuRKMI6dolYda85Ti/4lv2PT6bzPl+RR1fcjqzYuP4Hgtm6Z5WSIqviBfqsyTz sCsiDB83FPF/B7RqUIf3SzYANZg8Gw0wWaVMcvk5VZm/yZ9BuCvISDoTp7vl0vIQk2JxCldfq dppBlVYbFPwEBWcygloxU7nNZH/NUF0bBrZxlkhj8yrIBuxKj/o4yUN7qsp8UitVOCL1qWzYn LyxadLmfoLrR3VD6TEzqfnTRA4pV3XhU5+SFkPdoSzBOPDJCV4Jh02k04bGAg4soQ945jRJsh wBPWhfATK2hcEpg/WqTHi1YFwesIYvIUIrA5ym6DZje7ci8+8Kh1pCk9Tlh8C2oCLW6ZaI99K q7h5diTlzYAtLuaU58cpAoxNJf6oaww5/d5EixgHKEqvAdn5ZjgCN6293PUpP0XJEQQzci2Vy fo04abvq6ymQnFxMa//g== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200804_102539_920083_87B0AC0E X-CRM114-Status: GOOD ( 12.16 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [217.72.192.73 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [217.72.192.73 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Petr_=C5=A0tetiar?= Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Petr Štetiar 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 [adapt to recent changes, add dependency for WPA_WOLFSSL config] Signed-off-by: Adrian Schmutzler --- include/target.mk | 2 +- package/network/services/hostapd/Config.in | 3 +++ package/network/services/hostapd/Makefile | 13 +++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/include/target.mk b/include/target.mk index aba477e83b..6ed6565bda 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 81a374c652..b211877fb3 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 @@ -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 44312db590..b3e93cb770 100644 --- 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))