From 5c7127ff24a37d3491561018a9ddb1bf8a1a5635 Mon Sep 17 00:00:00 2001 From: Tesfa Mael Date: Tue, 22 Nov 2022 08:17:27 -0800 Subject: [PATCH 1/2] Support static memory with sp-math --- wolfssl/wolfcrypt/settings.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index 64f654d0d..c88e3798f 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -2290,10 +2290,6 @@ extern void uITRON4_free(void *p) ; #if defined(HAVE_IO_POOL) || defined(XMALLOC_USER) || defined(NO_WOLFSSL_MEMORY) #error static memory cannot be used with HAVE_IO_POOL, XMALLOC_USER or NO_WOLFSSL_MEMORY #endif - #if !defined(WOLFSSL_SP_MATH_ALL) && !defined(USE_FAST_MATH) && \ - !defined(NO_BIG_INT) - #error The static memory option is only supported for fast math or SP Math - #endif #ifdef WOLFSSL_SMALL_STACK #error static memory does not support small stack please undefine #endif From 4c95f64b77b509ad159f28daa276140754f75b9b Mon Sep 17 00:00:00 2001 From: Tesfa Mael Date: Tue, 22 Nov 2022 15:32:34 -0800 Subject: [PATCH 2/2] Check NO_BIG_INT with static memory --- wolfssl/wolfcrypt/settings.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index c88e3798f..ca5fd4880 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -2290,6 +2290,10 @@ extern void uITRON4_free(void *p) ; #if defined(HAVE_IO_POOL) || defined(XMALLOC_USER) || defined(NO_WOLFSSL_MEMORY) #error static memory cannot be used with HAVE_IO_POOL, XMALLOC_USER or NO_WOLFSSL_MEMORY #endif + #if !defined(WOLFSSL_SP_MATH_ALL) && !defined(USE_FAST_MATH) && \ + !defined(WOLFSSL_SP_MATH) && !defined(NO_BIG_INT) + #error The static memory option is only supported for fast math or SP Math + #endif #ifdef WOLFSSL_SMALL_STACK #error static memory does not support small stack please undefine #endif