From: John Audia <therealgraysky@proton.me>
Date: Thu, 21 Jul 2022 19:59:30 +0000 (-0400)
Subject: wolfssl: fix math library build
X-Git-Tag: v22.03.0-rc6~2
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c9cc3189ed886185e6a67530fc04154d8b26d5bd;p=openwrt%2Fstaging%2Fhauke.git

wolfssl: fix math library build

Apply upstream patch[1] to fix breakage around math libraries.
This can likely be removed when 5.5.0-stable is tagged and released.

Build system: x86_64
Build-tested: bcm2711/RPi4B
Run-tested: bcm2711/RPi4B

1. https://github.com/wolfSSL/wolfssl/pull/5390

Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit c2aa816f28e0fe2f6f77d0c6da4eba19ea8db4ea)
---

diff --git a/package/libs/wolfssl/patches/101-update-sp_rand_prime-s-preprocessor-gating-to-match.patch b/package/libs/wolfssl/patches/101-update-sp_rand_prime-s-preprocessor-gating-to-match.patch
new file mode 100644
index 0000000000..4b56c1568a
--- /dev/null
+++ b/package/libs/wolfssl/patches/101-update-sp_rand_prime-s-preprocessor-gating-to-match.patch
@@ -0,0 +1,23 @@
+From dc92ec2aa9cb76b782bdba3fc5203267ebf39994 Mon Sep 17 00:00:00 2001
+From: Kareem <kareem@wolfssl.com>
+Date: Fri, 22 Jul 2022 11:07:46 -0700
+Subject: [PATCH] Update sp_rand_prime's preprocessor gating to match
+ wolfSSL_BN_generate_prime_ex's.
+
+---
+ wolfcrypt/src/sp_int.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/wolfcrypt/src/sp_int.c
++++ b/wolfcrypt/src/sp_int.c
+@@ -15647,8 +15647,8 @@ int sp_radix_size(sp_int* a, int radix,
+  * Prime number generation and checking.
+  ***************************************/
+ 
+-#if defined(WOLFSSL_KEY_GEN) && (!defined(NO_DH) || !defined(NO_DSA)) && \
+-    !defined(WC_NO_RNG)
++#if defined(WOLFSSL_KEY_GEN) && (!defined(NO_RSA) || !defined(NO_DH) || \
++    !defined(NO_DSA)) && !defined(WC_NO_RNG)
+ /* Generate a random prime for RSA only.
+  *
+  * @param  [out]  r     SP integer to hold result.