From 3ac04fa3ee878a1fb4ff2a7b8183e0dfb12c2ee9 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Thu, 28 Jul 2022 09:26:46 -0500 Subject: [PATCH 1/2] wolfcrypt/benchmark/benchmark.c: fix gating for #include . --- wolfcrypt/benchmark/benchmark.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/wolfcrypt/benchmark/benchmark.c b/wolfcrypt/benchmark/benchmark.c index fd6c8e395..4a03f13f4 100644 --- a/wolfcrypt/benchmark/benchmark.c +++ b/wolfcrypt/benchmark/benchmark.c @@ -39,8 +39,10 @@ #ifdef HAVE_PTHREAD #include #endif -#if defined(HAVE_PTHREAD) || \ - (!defined(NO_STDIO_FILESYSTEM) && !defined(NO_ERROR_STRINGS)) +#if defined(HAVE_PTHREAD) || \ + (!defined(NO_CRYPT_BENCHMARK) && !defined(NO_STDIO_FILESYSTEM) && \ + !defined(NO_ERROR_STRINGS) && !defined(NO_MAIN_DRIVER) && \ + !defined(BENCH_EMBEDDED)) #include #include #endif @@ -320,7 +322,8 @@ #endif #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__ #else #define LIBCALL_CHECK_RET(...) do { \ From 545ba58cc0f0ff330d92bf52133e9c3ad364a75e Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Thu, 28 Jul 2022 09:27:49 -0500 Subject: [PATCH 2/2] sp_int.c sp_div(): add missing (err == MP_OKAY) clause to fix null ptr deref. --- wolfcrypt/src/sp_int.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wolfcrypt/src/sp_int.c b/wolfcrypt/src/sp_int.c index 763ec1f8f..ad74b1dc2 100644 --- a/wolfcrypt/src/sp_int.c +++ b/wolfcrypt/src/sp_int.c @@ -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)) && \ !defined(WOLFSSL_SP_NO_MALLOC) int cnt = 4;