feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #5415 from douzzer/20220728-fixes

Browse Source 
20220728-fixes
This commit is contained in:
David Garske
2022-07-28 12:48:40 -07:00
committed by GitHub
parent fde2097503 545ba58cc0
commit ac85000a02
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wolfcrypt/benchmark/benchmark.c
View File

@@ -40,7 +40,9 @@
#include <pthread.h> #include <pthread.h>
#endif #endif
#if defined(HAVE_PTHREAD) || \ #if defined(HAVE_PTHREAD) || \
(!defined(NO_STDIO_FILESYSTEM) && !defined(NO_ERROR_STRINGS)) (!defined(NO_CRYPT_BENCHMARK) && !defined(NO_STDIO_FILESYSTEM) && \
!defined(NO_ERROR_STRINGS) && !defined(NO_MAIN_DRIVER) && \
!defined(BENCH_EMBEDDED))
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#endif #endif
@@ -320,7 +322,8 @@
#endif #endif
#undef LIBCALL_CHECK_RET #undef LIBCALL_CHECK_RET
#if defined(NO_STDIO_FILESYSTEM) || defined(NO_ERROR_STRINGS) #if defined(NO_STDIO_FILESYSTEM) || defined(NO_ERROR_STRINGS) || \
defined(NO_MAIN_DRIVER) || defined(BENCH_EMBEDDED)
#define LIBCALL_CHECK_RET(...) __VA_ARGS__ #define LIBCALL_CHECK_RET(...) __VA_ARGS__
#else #else
#define LIBCALL_CHECK_RET(...) do { \ #define LIBCALL_CHECK_RET(...) do { \

2
wolfcrypt/src/sp_int.c
View File

@@ -7121,7 +7121,7 @@ int sp_div(sp_int* a, sp_int* d, sp_int* r, sp_int* rem)
} }
} }
if (!done) { if ((!done) && (err == MP_OKAY)) {
#if (defined(WOLFSSL_SMALL_STACK) || defined(SP_ALLOC)) && \ #if (defined(WOLFSSL_SMALL_STACK) || defined(SP_ALLOC)) && \
!defined(WOLFSSL_SP_NO_MALLOC) !defined(WOLFSSL_SP_NO_MALLOC)
int cnt = 4; int cnt = 4;