From patchwork Thu Oct 29 18:58:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Salvaterra X-Patchwork-Id: 1390326 X-Patchwork-Delegate: daniel@makrotopia.org 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=gmail.com 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=XvyQvEqh; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=LslKzqXL; 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 4CMZXT5wQnz9sPB for ; Fri, 30 Oct 2020 06:00:57 +1100 (AEDT) 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=yjoH5EgZlCWyTkJ/nnjcHPWWnI5EDeFRPQgADt0dsoo=; b=XvyQvEqhPeE/EBOWlMjqYyNX2p KCRCbwvzAp7xgOz1gYMmk2xqittYL8BWQhdhVOZ35o3D+R279YpXpZ343Q+UL63cB8svRX6iNoWH6 Gd7NM/aEF5qsRd5cBHn1os6eTGGGtepqf7C3l1dtWDrr4qg0a8w+CqdS8QKADdzn5MPCLtTXzHXZj xosT2/6VztL/7LcmnOGIRG9qP862SYCzZ8MpLtwNvB9STy6M+kNcrRxYKA+hizHFplcEraWKRDADI xFVH6COBHSXuNG2l5KOlG+XJQoQh4RPcSSXsCOjCMtUkXNTSPvtOTJMaQRaMWjOJLWpIlXBonHE7w +w7ACteQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYD8X-0000x7-Js; Thu, 29 Oct 2020 18:59:01 +0000 Received: from mail-io1-xd43.google.com ([2607:f8b0:4864:20::d43]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYD8U-0000vL-3P for openwrt-devel@lists.openwrt.org; Thu, 29 Oct 2020 18:59:00 +0000 Received: by mail-io1-xd43.google.com with SMTP id p15so4738402ioh.0 for ; Thu, 29 Oct 2020 11:58:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JOhYl5FQHwUbjEUjFBeF3hlW/zlWQDCoeCEaAntl1Ec=; b=LslKzqXLJLTxXn4RaiDkyj7uj/BOiR5D8336pIKvBSzpC9bYTPnjbD00QhbBImI/R2 m63AVma+A1LqPWhIGxFtVQ5AXB39jj3nepoxj6m2OLjjOK3+ue0z7n2oDAU9dmmTd54t 8I1vy2+pJ4SoIGzAESQ4bCUYr3MybY0ay9vUXloAhM4CAx3lvQIB+0oXKILU7DsM+dzR OmfsqL5MzxR1H6yG+mkt4etPu5u0t08fvTWhzBo8+0P1f7X0CYVrmCkWB5fMuSn1gzBV vag6spK9RZeTMx5GZ9zSgtb33gZC1qZXe5veovWaYihaJ6DIXmxLyHV6Igkmwd5Ev/RT 9xcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JOhYl5FQHwUbjEUjFBeF3hlW/zlWQDCoeCEaAntl1Ec=; b=tUe5ciYPIcIIGdB2FdpHScHyfZLqa+pHvSbwBBvIJsWTAxn/iRbi3iRHhsc6MQAiRH s/r+KwxpCgmBbX+vbgW1DRKhvNERf1gPHbF6qJkSfv+gSWWaJdwIRHcw99AGzW+Gd6oK 1xWIymUAvG16s+8JyCVjI1HZP/Zmp/w7ciEoIDwKy+EP5ERh14M5FdGzXhg8DMyVwFXt Zjsn9D8C5G0C0s6sCbq9TSkVAoco2v/OJSvuN5SGK8fKW3T1AZGARy9lS3/xqsW4BiEI oZkIkMf0pTyawgIm0h21daonqOxMy22ntaS5NjEqRDSoypNmpJtOfUlRF7xdbQKMW/gC ptZg== X-Gm-Message-State: AOAM531wRG7vjIwHcGDfZLSNibsGpuFWlpQjU+SS2YphxyhIQXqNGOCK Ec0zlac6Y/sm1vNXVsAk0/wWBi3kCTUtcNs= X-Google-Smtp-Source: ABdhPJwTHAA6t0yEZi08kAsDzeZh8FJGRuxTB6Og/Mj8QAb7rvE1/QsPMOgIwMOHZEOZS0qgyYYwOQ== X-Received: by 2002:a6b:3c10:: with SMTP id k16mr4811430iob.209.1603997922488; Thu, 29 Oct 2020 11:58:42 -0700 (PDT) Received: from presler.lan (a95-94-69-32.cpe.netcabo.pt. [95.94.69.32]) by smtp.gmail.com with ESMTPSA id u1sm3573269ili.55.2020.10.29.11.58.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2020 11:58:42 -0700 (PDT) From: Rui Salvaterra To: openwrt-devel@lists.openwrt.org Subject: [PATCH] hostapd: add {hostapd,wpad}-basic-openssl variants Date: Thu, 29 Oct 2020 18:58:37 +0000 Message-Id: <20201029185837.525003-1-rsalvaterra@gmail.com> X-Mailer: git-send-email 2.29.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201029_145858_185035_3E8156B9 X-CRM114-Status: GOOD ( 11.91 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rsalvaterra[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:d43 listed in] [list.dnswl.org] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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: Rui Salvaterra Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Add OpenSSL-linked basic variants (which provides WPA-PSK only, 802.11r and 802.11w) of both hostapd and wpad. For people who don't need the full hostapd but are stuck with libopenssl for other reasons, this saves space by avoiding the need of an additional library (or a larger hostapd with built-in crypto). Signed-off-by: Rui Salvaterra --- package/network/services/hostapd/Config.in | 2 ++ package/network/services/hostapd/Makefile | 26 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/package/network/services/hostapd/Config.in b/package/network/services/hostapd/Config.in index b211877fb3..8aa878d207 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-openssl || \ PACKAGE_wpad-basic-wolfssl || \ PACKAGE_wpad-mini || \ PACKAGE_wpad-mesh-openssl || \ @@ -33,6 +34,7 @@ config WPA_MSG_MIN_PRIORITY PACKAGE_wpad-openssl || \ PACKAGE_wpad-wolfssl || \ PACKAGE_wpad-basic || \ + PACKAGE_wpad-basic-openssl || \ PACKAGE_wpad-basic-wolfssl || \ PACKAGE_wpad-mini || \ PACKAGE_wpad-mesh-openssl || \ diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index bb20b7bcd9..f340cb1ebb 100644 --- a/package/network/services/hostapd/Makefile +++ b/package/network/services/hostapd/Makefile @@ -203,6 +203,17 @@ define Package/hostapd-basic/description This package contains a basic IEEE 802.1x/WPA Authenticator with WPA-PSK, 802.11r and 802.11w support. endef +define Package/hostapd-basic-openssl +$(call Package/hostapd/Default,$(1)) + TITLE+= (WPA-PSK, 11r and 11w) + VARIANT:=basic-openssl + DEPENDS+=+libopenssl +endef + +define Package/hostapd-basic-openssl/description + This package contains a basic IEEE 802.1x/WPA Authenticator with WPA-PSK, 802.11r and 802.11w support. +endef + define Package/hostapd-mini $(call Package/hostapd/Default,$(1)) TITLE+= (WPA-PSK only) @@ -266,6 +277,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-openssl +$(call Package/wpad/Default,$(1)) + TITLE+= (OpenSSL, 11r, 11w) + VARIANT:=wpad-basic-openssl + DEPENDS+=+libopenssl +endef + +define Package/wpad-basic-openssl/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-basic-wolfssl $(call Package/wpad/Default,$(1)) TITLE+= (wolfSSL, 11r, 11w) @@ -585,6 +607,7 @@ define Package/hostapd/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd/hostapd $(1)/usr/sbin/ endef Package/hostapd-basic/install = $(Package/hostapd/install) +Package/hostapd-basic-openssl/install = $(Package/hostapd/install) Package/hostapd-hs20/install = $(Package/hostapd/install) Package/hostapd-mini/install = $(Package/hostapd/install) Package/hostapd-openssl/install = $(Package/hostapd/install) @@ -605,6 +628,7 @@ define Package/wpad/install $(LN) wpad $(1)/usr/sbin/wpa_supplicant endef Package/wpad-basic/install = $(Package/wpad/install) +Package/wpad-basic-openssl/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) @@ -654,6 +678,7 @@ endif $(eval $(call BuildPackage,hostapd)) $(eval $(call BuildPackage,hostapd-basic)) +$(eval $(call BuildPackage,hostapd-basic-openssl)) $(eval $(call BuildPackage,hostapd-hs20)) $(eval $(call BuildPackage,hostapd-mini)) $(eval $(call BuildPackage,hostapd-openssl)) @@ -662,6 +687,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-openssl)) $(eval $(call BuildPackage,wpad-basic-wolfssl)) $(eval $(call BuildPackage,wpad-mini)) $(eval $(call BuildPackage,wpad-openssl))