wolfssl: Update to 5.7.0

[openwrt/staging/pepe2k.git] / package / libs / wolfssl / Makefile

diff --git a/package/libs/wolfssl/Makefile b/package/libs/wolfssl/Makefile
index def3f657c18ba6ab5bcd175c3610de3723eb8516..60ba85e15f443575ce2bf83345098adf2a386333 100644 (file)
--- a/package/libs/wolfssl/Makefile
+++ b/package/libs/wolfssl/Makefile
@@ -8,16 +8,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wolfssl
-PKG_VERSION:=5.5.0-stable
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_VERSION:=5.7.0-stable
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/wolfSSL/wolfssl/archive/v$(PKG_VERSION)
-PKG_HASH:=c34b74b5f689fac7becb05583b044e84d3b10d39f38709f0095dd5d423ded67f
+PKG_HASH:=2de93e8af588ee856fe67a6d7fce23fc1b226b74d710b0e3946bc8061f6aa18f
 
 PKG_FIXUP:=libtool libtool-abiver
 PKG_INSTALL:=1
-PKG_USE_MIPS16:=0
+PKG_BUILD_FLAGS:=no-mips16 lto
 PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=LICENSING COPYING
@@ -25,7 +25,6 @@ PKG_MAINTAINER:=Eneas U de Queiroz <cotequeiroz@gmail.com>
 PKG_CPE_ID:=cpe:/a:wolfssl:wolfssl
 
 PKG_CONFIG_DEPENDS:=\
-       CONFIG_PACKAGE_libwolfssl-benchmark \
        CONFIG_WOLFSSL_HAS_AES_CCM \
        CONFIG_WOLFSSL_HAS_ARC4 \
        CONFIG_WOLFSSL_HAS_CERTGEN \
@@ -44,6 +43,7 @@ PKG_CONFIG_DEPENDS:=\
 PKG_ABI_VERSION:=$(patsubst %-stable,%,$(PKG_VERSION)).$(call version_abbrev,$(call confvar,$(PKG_CONFIG_DEPENDS)))
 
 PKG_CONFIG_DEPENDS+=\
+       CONFIG_PACKAGE_libwolfssl-benchmark \
        CONFIG_WOLFSSL_HAS_AFALG \
        CONFIG_WOLFSSL_HAS_DEVCRYPTO_AES \
        CONFIG_WOLFSSL_HAS_DEVCRYPTO_CBC \
@@ -67,7 +67,7 @@ $(call Package/libwolfssl/Default)
   ABI_VERSION:=$(PKG_ABI_VERSION)
   VARIANT:=regular
   DEFAULT_VARIANT:=1
-  CONFLICTS:=libwolfssl-cpu-crypto
+  CONFLICTS:=libwolfsslcpu-crypto
 endef
 
 define Package/libwolfssl/description
@@ -79,7 +79,7 @@ define Package/libwolfssl/config
        source "$(SOURCE)/Config.in"
 endef
 
-define Package/libwolfssl-cpu-crypto
+define Package/libwolfsslcpu-crypto
 $(call Package/libwolfssl/Default)
   TITLE:=wolfSSL library with AES CPU instructions
   PROVIDES:=libwolfssl libcyassl
@@ -94,20 +94,20 @@ $(call Package/libwolfssl/Default)
   DEPENDS:=libwolfssl
 endef
 
-define Package/libwolfssl-cpu-crypto/description
+define Package/libwolfsslcpu-crypto/description
 $(call Package/libwolfssl/description)
 This variant uses AES CPU instructions (Intel AESNI or ARMv8 Crypto Extension)
 endef
 
-define Package/libwolfssl-cpu-crypto/config
-    if TARGET_armvirt && PACKAGE_libwolfssl-cpu-crypto = y
-       comment "You are about to build libwolfssl-cpu-crypto into an armvirt_64 image."
+define Package/libwolfsslcpu-crypto/config
+    if TARGET_armsr && PACKAGE_libwolfsslcpu-crypto = y
+       comment "You are about to build libwolfsslcpu-crypto into an armsr_64 image."
        comment "Ensure all of your installation targets support the Crypto Extension. "
        comment "Look for the 'aes' feature in /proc/cpuinfo. This library does not do "
        comment "run-time detection and will crash if the CPU does not support it.     "
     endif
-    if TARGET_bcm27xx && PACKAGE_libwolfssl-cpu-crypto
-       comment "Beware that libwolfssl-cpu-crypto will not run in a bcm27xx target.   "
+    if TARGET_bcm27xx && PACKAGE_libwolfsslcpu-crypto
+       comment "Beware that libwolfsslcpu-crypto will not run in a bcm27xx target.   "
     endif
 endef
 
@@ -118,12 +118,9 @@ endef
 TARGET_CFLAGS += \
        $(FPIC) \
        -fomit-frame-pointer \
-       -flto \
        -DFP_MAX_BITS=8192 \
        $(if $(CONFIG_WOLFSSL_ALT_NAMES),-DWOLFSSL_ALT_NAMES)
 
-TARGET_LDFLAGS += -flto
-
 # --enable-stunnel needed for OpenSSL API compatibility bits
 CONFIGURE_ARGS += \
        --enable-reproducible-build \
@@ -151,6 +148,33 @@ CONFIGURE_ARGS += \
        --$(if $(CONFIG_WOLFSSL_HAS_ECC448),enable,disable)-curve448 \
        --$(if $(CONFIG_WOLFSSL_HAS_OPENVPN),enable,disable)-openvpn
 
+define Package/libwolfsslcpu-crypto/preinst-aarch64
+#!/bin/sh
+exec >&2
+printf "[libwolfsslcpu-crypto] Checking for Arm v8-A Cryptographic Extension support: "
+if [ -n "$${IPKG_INSTROOT}" ]; then
+    printf "...[offline]... "
+    eval "$$(grep '^DISTRIB_TARGET=' "$${IPKG_INSTROOT}/etc/openwrt_release")"
+    echo "$${DISTRIB_TARGET}" | grep '^bcm27xx/.*' > /dev/null && {
+       echo "not supported"
+       echo "Error: Target $${DISTRIB_TARGET} does not support Arm Cryptographic Extension."
+       echo "Install the regular libwolfssl package instead of libwolfsslcpu-crypto."
+       exit 1
+    }
+else
+    grep -q '^Features.*\baes\b' /proc/cpuinfo || {
+       echo "not supported"
+       echo "Error: Arm v8-A Cryptographic Extension not supported."
+       echo "Install the regular libwolfssl package instead of libwolfsslcpu-crypto."
+       echo "Contents of /proc/cpuinfo:"
+       cat /proc/cpuinfo
+       exit 1
+    }
+fi
+echo OK
+exit 0
+endef
+
 ifeq ($(BUILD_VARIANT),regular)
 CONFIGURE_ARGS += \
        --$(if $(CONFIG_WOLFSSL_HAS_AFALG),enable,disable)-afalg \
@@ -160,9 +184,7 @@ CONFIGURE_ARGS += \
 else ifdef CONFIG_aarch64
     CONFIGURE_ARGS += --enable-armasm
     TARGET_CFLAGS:=$(TARGET_CFLAGS:-mcpu%=-mcpu%+crypto)
-    WOLFSSL_NOASM_REGEX:=^bcm27xx/.*
-    Package/libwolfssl-cpu-crypto/preinst=\
-       $(subst @@WOLFSSL_NOASM_REGEX@@,$(WOLFSSL_NOASM_REGEX),$(file <preinst.arm-ce))
+    Package/libwolfsslcpu-crypto/preinst=$(Package/libwolfsslcpu-crypto/preinst-aarch64)
 else ifdef CONFIG_TARGET_x86_64
        CONFIGURE_ARGS += --enable-intelasm
 endif
@@ -194,7 +216,7 @@ define Package/libwolfssl/install
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwolfssl.so.* $(1)/usr/lib/
 endef
 
-Package/libwolfssl-cpu-crypto/install=$(Package/libwolfssl/install)
+Package/libwolfsslcpu-crypto/install=$(Package/libwolfssl/install)
 
 define Package/libwolfssl-benchmark/install
        $(INSTALL_DIR) $(1)/usr/bin
@@ -202,5 +224,5 @@ define Package/libwolfssl-benchmark/install
 endef
 
 $(eval $(call BuildPackage,libwolfssl))
-$(eval $(call BuildPackage,libwolfssl-cpu-crypto))
+$(eval $(call BuildPackage,libwolfsslcpu-crypto))
 $(eval $(call BuildPackage,libwolfssl-benchmark))