wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for SP math only case to ensure fast math and heap math are disabled. Also fix build error for case where WOLFSSL_HAVE_SP_ECC is defined, but HAVE_ECC is not. ZD 16419

Browse Source
This commit is contained in:
David Garske
2023-07-10 13:09:58 -07:00
parent 2426cf14ca
commit 29edef1645
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wolfssl/wolfcrypt/settings.h
View File

@ -2033,17 +2033,22 @@ extern void uITRON4_free(void *p) ;
* Constant time: Always * Constant time: Always
* Enable: WOLFSSL_SP_MATH_ALL * Enable: WOLFSSL_SP_MATH_ALL
*/ */
#undef USE_FAST_MATH
#undef USE_INTEGER_HEAP_MATH
#elif defined(WOLFSSL_SP_MATH) #elif defined(WOLFSSL_SP_MATH)
/* 2) SP Math with restricted key sizes: wolfSSL proprietary math /* 2) SP Math with restricted key sizes: wolfSSL proprietary math
* implementation (sp_*.c). * implementation (sp_*.c).
* Constant time: Always * Constant time: Always
* Enable: WOLFSSL_SP_MATH * Enable: WOLFSSL_SP_MATH
*/ */
#undef USE_FAST_MATH
#undef USE_INTEGER_HEAP_MATH
#elif defined(USE_FAST_MATH) #elif defined(USE_FAST_MATH)
/* 3) Tom's Fast Math: Stack based (tfm.c) /* 3) Tom's Fast Math: Stack based (tfm.c)
* Constant time: Only with TFM_TIMING_RESISTANT * Constant time: Only with TFM_TIMING_RESISTANT
* Enable: USE_FAST_MATH * Enable: USE_FAST_MATH
*/ */
#undef USE_INTEGER_HEAP_MATH
#elif defined(USE_INTEGER_HEAP_MATH) #elif defined(USE_INTEGER_HEAP_MATH)
/* 4) Integer Heap Math: Heap based (integer.c) /* 4) Integer Heap Math: Heap based (integer.c)
* Constant time: Not supported * Constant time: Not supported

6
wolfssl/wolfcrypt/sp.h
View File

@ -41,7 +41,11 @@
#include <wolfssl/wolfcrypt/wolfmath.h> #include <wolfssl/wolfcrypt/wolfmath.h>
#include <wolfssl/wolfcrypt/sp_int.h> #include <wolfssl/wolfcrypt/sp_int.h>
#include <wolfssl/wolfcrypt/ecc.h> #if defined(HAVE_ECC) && defined(WOLFSSL_HAVE_SP_ECC)
#include <wolfssl/wolfcrypt/ecc.h>
#else
#undef WOLFSSL_HAVE_SP_ECC
#endif
#ifdef noinline #ifdef noinline
#define SP_NOINLINE noinline #define SP_NOINLINE noinline