domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wolfssl: fix options and add support for wpa_supplicant features

Browse Source 
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>
This commit is contained in:
Daniel Golle
2018-04-28 20:55:51 +02:00
committed by John Crispin
parent 20e5fefb0c
commit c67a9bed20
2 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
package/libs/wolfssl/Config.in
View File

@@ -32,10 +32,22 @@ config WOLFSSL_HAS_PSK
bool "Include PKS (Pre Share Key) support" bool "Include PKS (Pre Share Key) support"
default n default n
config WOLFSSL_HAS_SESSION_TICKET
bool "Include session ticket support"
default n
config WOLFSSL_HAS_DTLS config WOLFSSL_HAS_DTLS
bool "Include DTLS support" bool "Include DTLS support"
default n 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 config WOLFSSL_HAS_ECC25519
bool "Include ECC Curve 22519 support" bool "Include ECC Curve 22519 support"
depends on WOLFSSL_HAS_ECC depends on WOLFSSL_HAS_ECC

33
package/libs/wolfssl/Makefile
View File

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=wolfssl PKG_NAME:=wolfssl
PKG_VERSION:=3.12.2 PKG_VERSION:=3.12.2
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip
PKG_SOURCE_URL:=https://www.wolfssl.com/ PKG_SOURCE_URL:=https://www.wolfssl.com/
@@ -51,7 +51,9 @@ CONFIGURE_ARGS += \
--enable-opensslextra \ --enable-opensslextra \
--enable-sni \ --enable-sni \
--enable-stunnel \ --enable-stunnel \
--disable-examples --disable-examples \
--disable-leanpsk \
--disable-leantls \
ifeq ($(CONFIG_IPV6),y) ifeq ($(CONFIG_IPV6),y)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
@@ -79,19 +81,25 @@ CONFIGURE_ARGS += \
--enable-supportedcurves --enable-supportedcurves
endif endif
ifneq ($(CONFIG_WOLFSSL_HAS_DH),y) ifeq ($(CONFIG_WOLFSSL_HAS_DH),y)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--enable-dh --enable-dh
endif endif
ifeq ($(CONFIG_WOLFSSL_HAS_ARC4),n) ifneq ($(CONFIG_WOLFSSL_HAS_ARC4),y)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--disable-arc4 --disable-arc4
else
CONFIGURE_ARGS += \
--enable-arc4
endif endif
ifeq ($(CONFIG_WOLFSSL_HAS_DES3),y) ifneq ($(CONFIG_WOLFSSL_HAS_DES3),y)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--disable-des3 --disable-des3
else
CONFIGURE_ARGS += \
--enable-des3
endif endif
ifeq ($(CONFIG_WOLFSSL_HAS_PSK),y) ifeq ($(CONFIG_WOLFSSL_HAS_PSK),y)
@@ -99,11 +107,26 @@ CONFIGURE_ARGS += \
--enable-psk --enable-psk
endif endif
ifeq ($(CONFIG_WOLFSSL_HAS_SESSION_TICKET),y)
CONFIGURE_ARGS += \
--enable-session-ticket
endif
ifeq ($(CONFIG_WOLFSSL_HAS_DTLS),y) ifeq ($(CONFIG_WOLFSSL_HAS_DTLS),y)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--enable-dtls --enable-dtls
endif 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) ifeq ($(CONFIG_WOLFSSL_HAS_ECC25519),y)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--enable-curve25519 --enable-curve25519