[openwrt/openwrt] wolfssl: fix compile when enable-devcrypto is set

LEDE Commits lede-commits at lists.infradead.org
Wed Oct 20 15:18:44 PDT 2021


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/be3e260f92643a841f4f83b03cbb07b9a26cff66

commit be3e260f92643a841f4f83b03cbb07b9a26cff66
Author: Ivan Pavlov <AuthorReflex at gmail.com>
AuthorDate: Fri Oct 15 08:11:10 2021 +0300

    wolfssl: fix compile when enable-devcrypto is set
    
    fixing linking error when --enable-devcrypto=yes
    fixes: 7d92bb050961 wolfssl: update to 4.8.1-stable
    
    Signed-off-by: Ivan Pavlov <AuthorReflex at gmail.com>
---
 ...date-macro-guard-on-SHA256-transform-call.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/package/libs/wolfssl/patches/002-Update-macro-guard-on-SHA256-transform-call.patch b/package/libs/wolfssl/patches/002-Update-macro-guard-on-SHA256-transform-call.patch
new file mode 100644
index 0000000000..f986b72798
--- /dev/null
+++ b/package/libs/wolfssl/patches/002-Update-macro-guard-on-SHA256-transform-call.patch
@@ -0,0 +1,22 @@
+From f447e4c1fa4c932c0286fa0331966756e243db81 Mon Sep 17 00:00:00 2001
+From: JacobBarthelmeh <jacob at wolfssl.com>
+Date: Fri, 17 Sep 2021 15:06:13 -0700
+Subject: [PATCH] update macro guard on SHA256 transform call
+
+---
+ src/ssl.c   | 3 ++-
+ tests/api.c | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+--- a/src/ssl.c
++++ b/src/ssl.c
+@@ -17639,7 +17639,8 @@ size_t wolfSSL_get_client_random(const W
+     
+     #if defined(OPENSSL_EXTRA)
+     #if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || \
+-        (defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION > 2)))
++        (defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION > 2))) && \
++        !defined(WOLFSSL_DEVCRYPTO_HASH) && !defined(WOLFSSL_AFALG_HASH)
+     /* Apply SHA256 transformation to the data */
+     int wolfSSL_SHA256_Transform(WOLFSSL_SHA256_CTX* sha256, 
+                                                 const unsigned char* data)



More information about the lede-commits mailing list