From: Daniel Golle <daniel@makrotopia.org>
Date: Sat, 28 Apr 2018 18:55:51 +0000 (+0200)
Subject: wolfssl: fix options and add support for wpa_supplicant features
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c67a9bed2074e363da294e8695b32de4a6afdb02;p=openwrt%2Fstaging%2Fjow.git

wolfssl: fix options and add support for wpa_supplicant features

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 <daniel@makrotopia.org>
---

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