From patchwork Sat Apr 28 18:55:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 906174 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=makrotopia.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="rJvgT2VK"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40YKlh5ykxz9s0w for ; Sun, 29 Apr 2018 04:56:28 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-ID:To:From :Date: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=8c/S9WSRDcWymAW73J/4y/qTdg7/XFDAk0CZobn/k8g=; b=rJvgT2VKxSdSNO GxvnGh/aYj5/5+3RiXVBhe/AWPnawiDO1WBuHFJpA2klVTduyWLVb1zfVhWupGmu0A+DnnVDGI1Lh ekP3sex7uQRHFj8JUDB/IwBJeGSnlz/UQm+pa6qzekumiemmappFQjwHL2ui3kR4p8BbPkFD+ZuNe cdC3SoEUQv81NMeYFK7vR7LoVw7eBnJht/4Diw1d86WMcJK4kmKCNni6hg3ftFRX1W9j9j8uSMk2h oCiCYlVRBD4P4/hXwXAyc0wjWhAlg6Hp+z2JYWuKbbEy84424cCQlXxJlQslZ+ItEEiN9Ph/2jtEf 5+E+2bT4IMxPW3wXXr5w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fCV19-0005Yg-Vy; Sat, 28 Apr 2018 18:56:19 +0000 Received: from fudo.makrotopia.org ([2a07:2ec0:3002::71]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fCV16-0005XN-1p for lede-dev@lists.infradead.org; Sat, 28 Apr 2018 18:56:17 +0000 Received: from local by fudo.makrotopia.org with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1fCV0m-00088o-Tm; Sat, 28 Apr 2018 20:55:57 +0200 Date: Sat, 28 Apr 2018 20:55:51 +0200 From: Daniel Golle To: lede-dev@lists.infradead.org, openwrt-devel@lists.openwrt.org Message-ID: <20180428185449.GA29460@makrotopia.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.5 (2018-04-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180428_115616_111113_D391186E X-CRM114-Status: UNSURE ( 8.15 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record Subject: [LEDE-DEV] [PATCH] wolfssl: fix options and add support for wpa_supplicant features X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandru Ardelean Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Some options' default values have been changed upstream, others were accidentally inverted (CONFIG_WOLFSSL_HAS_DES3). Also add options needed to build hostapd/wpa_supplicant against wolfssl. Signed-off-by: Daniel Golle --- package/libs/wolfssl/Config.in | 12 ++++++++++++ package/libs/wolfssl/Makefile | 33 ++++++++++++++++++++++++++++----- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/package/libs/wolfssl/Config.in b/package/libs/wolfssl/Config.in index 7e8a4b6cee..9b88914516 100644 --- a/package/libs/wolfssl/Config.in +++ b/package/libs/wolfssl/Config.in @@ -32,10 +32,22 @@ config WOLFSSL_HAS_PSK bool "Include PKS (Pre Share Key) support" default n +config WOLFSSL_HAS_SESSION_TICKET + bool "Include session ticket support" + default n + config WOLFSSL_HAS_DTLS bool "Include DTLS support" default n +config WOLFSSL_HAS_OCSP + bool "Include OSCP support" + default n + +config WOLFSSL_HAS_WPAS + bool "Include wpa_supplicant support" + default n + config WOLFSSL_HAS_ECC25519 bool "Include ECC Curve 22519 support" depends on WOLFSSL_HAS_ECC diff --git a/package/libs/wolfssl/Makefile b/package/libs/wolfssl/Makefile index 1d4b7f5579..d0bd3b5a35 100644 --- a/package/libs/wolfssl/Makefile +++ b/package/libs/wolfssl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wolfssl PKG_VERSION:=3.12.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip PKG_SOURCE_URL:=https://www.wolfssl.com/ @@ -51,7 +51,9 @@ CONFIGURE_ARGS += \ --enable-opensslextra \ --enable-sni \ --enable-stunnel \ - --disable-examples + --disable-examples \ + --disable-leanpsk \ + --disable-leantls \ ifeq ($(CONFIG_IPV6),y) CONFIGURE_ARGS += \ @@ -79,19 +81,25 @@ CONFIGURE_ARGS += \ --enable-supportedcurves endif -ifneq ($(CONFIG_WOLFSSL_HAS_DH),y) +ifeq ($(CONFIG_WOLFSSL_HAS_DH),y) CONFIGURE_ARGS += \ --enable-dh endif -ifeq ($(CONFIG_WOLFSSL_HAS_ARC4),n) +ifneq ($(CONFIG_WOLFSSL_HAS_ARC4),y) CONFIGURE_ARGS += \ --disable-arc4 +else +CONFIGURE_ARGS += \ + --enable-arc4 endif -ifeq ($(CONFIG_WOLFSSL_HAS_DES3),y) +ifneq ($(CONFIG_WOLFSSL_HAS_DES3),y) CONFIGURE_ARGS += \ --disable-des3 +else +CONFIGURE_ARGS += \ + --enable-des3 endif ifeq ($(CONFIG_WOLFSSL_HAS_PSK),y) @@ -99,11 +107,26 @@ CONFIGURE_ARGS += \ --enable-psk endif +ifeq ($(CONFIG_WOLFSSL_HAS_SESSION_TICKET),y) +CONFIGURE_ARGS += \ + --enable-session-ticket +endif + ifeq ($(CONFIG_WOLFSSL_HAS_DTLS),y) CONFIGURE_ARGS += \ --enable-dtls endif +ifeq ($(CONFIG_WOLFSSL_HAS_OCSP),y) +CONFIGURE_ARGS += \ + --enable-ocsp --enable-ocspstapling --enable-ocspstapling2 +endif + +ifeq ($(CONFIG_WOLFSSL_HAS_WPAS),y) +CONFIGURE_ARGS += \ + --enable-wpas --enable-sha512 --enable-fortress --enable-fastmath +endif + ifeq ($(CONFIG_WOLFSSL_HAS_ECC25519),y) CONFIGURE_ARGS += \ --enable-curve25519