diff options
| author | Nick Hainke <vincent@systemli.org> | 2022-12-29 23:11:37 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-01-01 21:42:39 +0100 |
| commit | 77e2a24e6240778c7a0af848e3b8d852161da41f (patch) | |
| tree | 59dd15dac5d902a2beb245ef42cb3fcddd2af02a | |
| parent | 158a33591d5d4baeb5b09f7c2eec9b5a0b8db609 (diff) | |
| download | upstream-77e2a24e6240778c7a0af848e3b8d852161da41f.tar.gz upstream-77e2a24e6240778c7a0af848e3b8d852161da41f.tar.bz2 upstream-77e2a24e6240778c7a0af848e3b8d852161da41f.zip | |
wolfssl: update to 5.5.4-stable
Remove upstreamed:
- 001-Fix-enable-devcrypto-build-error.patch
Refresh patch:
- 100-disable-hardening-check.patch
Release notes:
https://github.com/wolfSSL/wolfssl/releases/tag/v5.5.4-stable
Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 04634b2d8253972a3e7b663231474eb564e69077)
| -rw-r--r-- | package/libs/wolfssl/Makefile | 4 | ||||
| -rw-r--r-- | package/libs/wolfssl/patches/001-Fix-enable-devcrypto-build-error.patch | 33 | ||||
| -rw-r--r-- | package/libs/wolfssl/patches/100-disable-hardening-check.patch | 2 |
3 files changed, 3 insertions, 36 deletions
diff --git a/package/libs/wolfssl/Makefile b/package/libs/wolfssl/Makefile index 2ff3fea7a8..32bcf3154a 100644 --- a/package/libs/wolfssl/Makefile +++ b/package/libs/wolfssl/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wolfssl -PKG_VERSION:=5.5.3-stable +PKG_VERSION:=5.5.4-stable PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/wolfSSL/wolfssl/archive/v$(PKG_VERSION) -PKG_HASH:=fd3135b8657d09fb96a8aad16585da850b96ea420ae8ce5ac4d5fdfc614c2683 +PKG_HASH:=b7ee150e49def77c765bc02aac92ddeb0bebefd4cb12aa263d8f95e405221fb8 PKG_FIXUP:=libtool libtool-abiver PKG_INSTALL:=1 diff --git a/package/libs/wolfssl/patches/001-Fix-enable-devcrypto-build-error.patch b/package/libs/wolfssl/patches/001-Fix-enable-devcrypto-build-error.patch deleted file mode 100644 index bcdaf2b7a2..0000000000 --- a/package/libs/wolfssl/patches/001-Fix-enable-devcrypto-build-error.patch +++ /dev/null @@ -1,33 +0,0 @@ -From dc9f46a3be00b5e82684a158605189d1278e324c Mon Sep 17 00:00:00 2001 -From: Eric Blankenhorn <eric@wolfssl.com> -Date: Wed, 12 Oct 2022 16:05:17 -0500 -Subject: [PATCH] Fix --enable-devcrypto build error for sys without u_int8_t - type - ---- - wolfcrypt/src/port/devcrypto/README.md | 2 +- - wolfcrypt/src/port/devcrypto/wc_devcrypto.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - ---- a/wolfcrypt/src/port/devcrypto/README.md -+++ b/wolfcrypt/src/port/devcrypto/README.md -@@ -22,7 +22,7 @@ modprobe cryptodev - For default build with all supported features use: - - ``` --./configure --enable-cryptodev -+./configure --enable-devcrypto - ``` - - Or for more control over features used: ---- a/wolfcrypt/src/port/devcrypto/wc_devcrypto.c -+++ b/wolfcrypt/src/port/devcrypto/wc_devcrypto.c -@@ -122,7 +122,7 @@ int wc_DevCryptoCreate(WC_CRYPTODEV* ctx - case CRYPTO_SHA2_512_HMAC: - ctx->sess.cipher = 0; - ctx->sess.mac = type; -- ctx->sess.mackey = (u_int8_t*)key; -+ ctx->sess.mackey = (byte*)key; - ctx->sess.mackeylen = keySz; - break; - diff --git a/package/libs/wolfssl/patches/100-disable-hardening-check.patch b/package/libs/wolfssl/patches/100-disable-hardening-check.patch index 904b424fa0..af774181ec 100644 --- a/package/libs/wolfssl/patches/100-disable-hardening-check.patch +++ b/package/libs/wolfssl/patches/100-disable-hardening-check.patch @@ -1,6 +1,6 @@ --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h -@@ -2455,7 +2455,7 @@ extern void uITRON4_free(void *p) ; +@@ -2496,7 +2496,7 @@ extern void uITRON4_free(void *p) ; #endif /* warning for not using harden build options (default with ./configure) */ |