From patchwork Wed Jul 29 20:09:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1338487 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=F/0sCv9T; 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 4BH4T46Cwjz9sRW for ; Thu, 30 Jul 2020 06:12:08 +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:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=LSjrAafpQ5MjX0/ETM+EDeh9xWNj4D92XO//hx1SsPI=; b=F/0sCv9Tsgb+s45JTcgsHYWgJQ skvKf17w8gfdmPO0wKrgq7z8cIdu2CJc32dAlEqoaDY6yVyfS3HA4NkNWIGxopzB00wnAcH/fqmzL edi0HwQSdO3GG50r1mhg/iB6x/TFGx4cVm2RUuqlebP8XMY5qu4kx9fTZZXynMuGILygjpjnsq30w GcLcMeiLVdp8t0YxzCzk/jT2S4dC8nMc7G/eZpmv0JdB3dBumAj6ls5WLp8Zmh1gI50gFBA0ImF2j wKTXRowEcEUOFInlwoog2070VRhCeEbrs8nUUMI/xRPsrS/zlDuSTSGCnzmwikjKIsSPR6lXZdY3C Df+eeAlA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k0sOw-0003US-Fc; Wed, 29 Jul 2020 20:10:10 +0000 Received: from mout.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k0sOt-0003U1-SV for openwrt-devel@lists.openwrt.org; Wed, 29 Jul 2020 20:10:08 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MyseA-1kwOfH0xrG-00vvRd for ; Wed, 29 Jul 2020 22:10:05 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH] hostapd: reorganize config selection hierarchy for WPA3 Date: Wed, 29 Jul 2020 22:09:17 +0200 Message-Id: <20200729200917.33695-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:K7LEEH7ALBbc7WB9jL3VBAunTWnERS7YP2v6Ch42uKa0LI9dCoX LRxmdQjCnS4iNVH7OSDiCXxfAAu0bREGCsh27gf+LMzJB2kXZZJ0ug8SXwLYWP+d5bB5N1G res9pgcoG9GNn1IGooqMMsBex0aKSSC4uOY1Ypd9oIlgCKbi5pt3qAFf5GwFCAqBE3bbGhq wdTcqAtpKkW5cNydhpJqQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:fp1iKHoCUGc=:RFjYikM6lCzIhH78+V72AS qlZ4eohAcNyOFuOrp/sva3ueRzwbJQWMmEl9P9xL5Sihh3WFgKrTue9qAxGWvlvHTWdSqMuhZ 8kbEwexonXDkh9R2SyGO5e+U8sqbmfaS5K+cgq/nXRp4WYU2AKdHVjSm1SZAAstuAigAcA2Jj IUzOF9RtCy8m6wo5xSHSJ6/ahs+/4zPmQnWdcqlPGUNlwFRbh4nDFmBwK2paeLEKax66D32la g4rnDqWxCmbg/g2i4sJ8nNxCJpL5ZYA+p95PGEGSeX7rZjrdHB16gIpQkJeyJq5n8myACAuwf 0Zpkxq8G0/6L7ArsE6G18VbUySugZ3h2y/DkQrVWhhFRPJ4miKFfMZ4zbXXwTX/CMcxvT+CR4 vKmFFj/4u12VD/qoLISJJc2xjFhxIcCCzR5YZDtgNVt+RMboDCZOkCKqCQA0PVk1dDoGtCtzG kD+2yX8LJMtCR7C5q0zIhI14r1hzA332AUp+scz4za6acSZM7gtsItvL8TXii5DYmi2NmcCn1 weJGqcRqhzdS6cvm0lB3btJUXgUU1P5RkVGfenWyngYfQLMYRODpAQeNd2y99ZxE70p4ILOGW 4wWWUHZmoUYYQGuBrB5j0pZdx8vCP+vTlR1uUQ26eoUbtlWh+6bsAcclmghlqVp3re23jnVJt XwcdcIsv0KZ1oOW9qDk2R2QHKvPZ2vtB/IFppN24qp0bLWF3sahDr/RS+pYRHoMeJZ3HVsApU upvs/vpSc181NoaumuywuASCSfDt1PX+cpLNlNnUcxDNsAH6dsj7EXp2LUul9DT5kGWVHxXmv 0SsQpNbnc3N99g0WaxV8LSxLMBk72uIw2u79Za8hJfwJmTwuzYa2/O0gbKknxqPnCOAmNFxmd MjS5EIm6jNukbrgzIOzA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200729_161008_153704_A52ACCDE X-CRM114-Status: GOOD ( 12.29 ) 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 [212.227.126.187 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.187 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an 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: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The current selection of DRIVER_MAKEOPTS and TARGET_LDFLAGS is exceptionally hard to read. This tries to make things a little easier by inverting the hierarchy of the conditions, so SSL_VARIANT is checked first and LOCAL_VARIANT is checked second. This exploits the fact that some of the previous conditions were unnecessary, e.g. openssl is only available for mesh/full and not available for hostapd, so we don't need to check that. It also should make it a little easier to see which options are actually switched by SSL_VARIANT and which by LOCAL_VARIANT. The patch is supposed to be cosmetic. Signed-off-by: Adrian Schmutzler --- This is based on ynezz' patch "hostapd: add wpad-basic-wolfssl variant". --- package/network/services/hostapd/Makefile | 39 ++++++++++------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index df1a80d3da..49be98fba2 100644 --- a/package/network/services/hostapd/Makefile +++ b/package/network/services/hostapd/Makefile @@ -98,36 +98,31 @@ ifneq ($(LOCAL_VARIANT),mini) DRIVER_MAKEOPTS += CONFIG_IEEE80211W=$(CONFIG_DRIVER_11W_SUPPORT) endif -ifeq ($(LOCAL_VARIANT),full) - ifeq ($(SSL_VARIANT),openssl) - DRIVER_MAKEOPTS += CONFIG_TLS=openssl CONFIG_SAE=y CONFIG_OWE=y CONFIG_SUITEB192=y CONFIG_AP=y CONFIG_MESH=y - TARGET_LDFLAGS += -lcrypto -lssl +ifeq ($(SSL_VARIANT),openssl) + DRIVER_MAKEOPTS += CONFIG_TLS=openssl CONFIG_SAE=y + TARGET_LDFLAGS += -lcrypto -lssl + + ifeq ($(LOCAL_VARIANT),mesh) + DRIVER_MAKEOPTS += CONFIG_AP=y CONFIG_MESH=y endif - ifeq ($(SSL_VARIANT),wolfssl) - DRIVER_MAKEOPTS += CONFIG_TLS=wolfssl CONFIG_WPS_NFC=1 CONFIG_SAE=y CONFIG_OWE=y CONFIG_SUITEB192=y CONFIG_AP=y CONFIG_MESH=y - TARGET_LDFLAGS += -lwolfssl + ifeq ($(LOCAL_VARIANT),full) + DRIVER_MAKEOPTS += CONFIG_OWE=y CONFIG_SUITEB192=y CONFIG_AP=y CONFIG_MESH=y endif endif -ifeq ($(LOCAL_VARIANT),basic) - ifeq ($(SSL_VARIANT),wolfssl) - DRIVER_MAKEOPTS += CONFIG_TLS=wolfssl CONFIG_SAE=y - TARGET_LDFLAGS += -lwolfssl - endif -endif +ifeq ($(SSL_VARIANT),wolfssl) + DRIVER_MAKEOPTS += CONFIG_TLS=wolfssl CONFIG_SAE=y + TARGET_LDFLAGS += -lwolfssl -ifneq ($(LOCAL_TYPE),hostapd) ifeq ($(LOCAL_VARIANT),mesh) - ifeq ($(SSL_VARIANT),openssl) - DRIVER_MAKEOPTS += CONFIG_TLS=openssl CONFIG_AP=y CONFIG_SAE=y CONFIG_MESH=y - TARGET_LDFLAGS += -lcrypto -lssl - endif - ifeq ($(SSL_VARIANT),wolfssl) - DRIVER_MAKEOPTS += CONFIG_TLS=wolfssl CONFIG_WPS_NFC=1 CONFIG_AP=y CONFIG_SAE=y CONFIG_MESH=y - TARGET_LDFLAGS += -lwolfssl - endif + DRIVER_MAKEOPTS += CONFIG_AP=y CONFIG_MESH=y CONFIG_WPS_NFC=1 + endif + ifeq ($(LOCAL_VARIANT),full) + DRIVER_MAKEOPTS += CONFIG_OWE=y CONFIG_SUITEB192=y CONFIG_AP=y CONFIG_MESH=y CONFIG_WPS_NFC=1 endif +endif +ifneq ($(LOCAL_TYPE),hostapd) ifdef CONFIG_WPA_RFKILL_SUPPORT DRIVER_MAKEOPTS += NEED_RFKILL=y endif